[brlcad-commits] SF.net SVN: brlcad:[57845] brlcad/trunk/src/conv/step/g-step
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad:[57845] brlcad/trunk/src/conv/step/g-step
|
From: <sta...@us...> - 2013-09-23 19:53:36
|
Revision: 57845
http://sourceforge.net/p/brlcad/code/57845
Author: starseeker
Date: 2013-09-23 19:53:31 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
Move bits related to comb structure assembly into Assembly_Product.
Modified Paths:
--------------
brlcad/trunk/src/conv/step/g-step/Assembly_Product.cpp
brlcad/trunk/src/conv/step/g-step/Comb_Tree.cpp
Added Paths:
-----------
brlcad/trunk/src/conv/step/g-step/Assembly_Product.h
Modified: brlcad/trunk/src/conv/step/g-step/Assembly_Product.cpp
===================================================================
--- brlcad/trunk/src/conv/step/g-step/Assembly_Product.cpp 2013-09-23 19:47:59 UTC (rev 57844)
+++ brlcad/trunk/src/conv/step/g-step/Assembly_Product.cpp 2013-09-23 19:53:31 UTC (rev 57845)
@@ -24,6 +24,7 @@
#include "common.h"
+#include "raytrace.h"
#include "G_STEP_internal.h"
#include "ON_Brep.h"
@@ -125,10 +126,93 @@
*
*/
+/* TODO - generic, move to the internal utility file */
+STEPentity *
+Identity_AXIS2_PLACEMENT_3D(Registry *registry, InstMgr *instance_list) {
+ SdaiCartesian_point *pnt = (SdaiCartesian_point *)registry->ObjCreate("CARTESIAN_POINT");
+ XYZ_to_Cartesian_point(0.0, 0.0, 0.0, pnt);
+ SdaiDirection *axis = (SdaiDirection *)registry->ObjCreate("DIRECTION");
+ XYZ_to_Direction(0.0, 0.0, 1.0, axis);
+ SdaiDirection *ref = (SdaiDirection *)registry->ObjCreate("DIRECTION");
+ XYZ_to_Direction(1.0, 0.0, 0.0, ref);
+ SdaiAxis2_placement_3d *placement = (SdaiAxis2_placement_3d *)registry->ObjCreate("AXIS2_PLACEMENT_3D");
+ placement->location_(pnt);
+ placement->axis_(axis);
+ placement->ref_direction_(ref);
+ instance_list->Append((STEPentity *)pnt, completeSE);
+ instance_list->Append((STEPentity *)axis, completeSE);
+ instance_list->Append((STEPentity *)ref, completeSE);
+ instance_list->Append((STEPentity *)placement, completeSE);
+ return (STEPentity *)placement;
+}
+
void
-Add_Assembly_Product(Registry *registry, InstMgr *instance_list)
+Add_Assembly_Product(struct directory *dp, struct db_i *dbip, struct bu_ptbl *children,
+ std::map<struct directory *, STEPentity *> *comb_to_step,
+ Registry *registry, InstMgr *instance_list)
{
+ struct rt_db_internal comb_intern;
+ rt_db_get_internal(&comb_intern, dp, dbip, bn_mat_identity, &rt_uniresource);
+ RT_CK_DB_INTERNAL(&comb_intern);
+ struct rt_comb_internal *comb = (struct rt_comb_internal *)(comb_intern.idb_ptr);
+ for (int j = (int)BU_PTBL_LEN(children) - 1; j >= 0; j--){
+ struct directory *curr_dp = (struct directory *)BU_PTBL_GET(children, j);
+ bu_log("%s under %s: ", curr_dp->d_namep, dp->d_namep);
+ union tree *curr_node = db_find_named_leaf(comb->tree, curr_dp->d_namep);
+ matp_t curr_matrix = curr_node->tr_l.tl_mat;
+ if(curr_matrix) {
+ bu_log(" - found matrix over %s in %s\n", curr_dp->d_namep, dp->d_namep);
+ bn_mat_print(curr_dp->d_namep, curr_matrix);
+ //TODO - investigate CARTESIAN_TRANSFORMATION_OPERATOR_3D, which seems to
+ // allow uniform scaling as well and appears to be compatible with the
+ // same slot used for AXIS2_PLACEMENT_3D - may be able to use the latter
+ // for simple cases without scaling (i.e. VUNITIZE doesn't change the length
+ // of X, Y or Z unit vectors after the matrix is applied), the former when
+ // the there is uniform scaling (X, Y and Z lengths all change by the same
+ // amount) and in the worst case (non-uniform scaling) will have to create
+ // a new Brep and abandon the attempt to preserve the comb-level operation.
+
+ vect_t inv, outv;
+ VSET(inv, 0, 0, 0);
+ MAT4X3PNT(outv, curr_matrix, inv);
+ bu_log("AXIS2_PLACEMENT_3D cartesian_point: %f, %f, %f\n", outv[0], outv[1], outv[2]);
+ VSET(inv, 0, 0, 1);
+ MAT4X3VEC(outv, curr_matrix, inv);
+ VUNITIZE(outv);
+ bu_log("AXIS2_PLACEMENT_3D axis: %f, %f, %f\n", outv[0], outv[1], outv[2]);
+ VSET(inv, 1, 0, 0);
+ MAT4X3VEC(outv, curr_matrix, inv);
+ VUNITIZE(outv);
+ bu_log("AXIS2_PLACEMENT_3D ref axis: %f, %f, %f\n", outv[0], outv[1], outv[2]);
+
+ vect_t outx, outy, outz;
+ fastf_t xm, ym, zm;
+ VSET(inv, 0, 0, 0);
+ MAT4X3PNT(outv, curr_matrix, inv);
+ bu_log("CAERTESIAN_TRANSFORMATION_OPERATOR_3D local_origin: %f, %f, %f\n", outv[0], outv[1], outv[2]);
+ VSET(inv, 1, 0, 0);
+ MAT4X3VEC(outx, curr_matrix, inv);
+ xm = MAGNITUDE(outx);
+ VUNITIZE(outx);
+ bu_log("CAERTESIAN_TRANSFORMATION_OPERATOR_3D axis1: %f, %f, %f\n", outx[0], outx[1], outx[2]);
+ VSET(inv, 0, 1, 0);
+ MAT4X3VEC(outy, curr_matrix, inv);
+ ym = MAGNITUDE(outy);
+ VUNITIZE(outy);
+ bu_log("CAERTESIAN_TRANSFORMATION_OPERATOR_3D axis2: %f, %f, %f\n", outy[0], outy[1], outy[2]);
+ VSET(inv, 0, 0, 1);
+ MAT4X3VEC(outz, curr_matrix, inv);
+ zm = MAGNITUDE(outz);
+ VUNITIZE(outz);
+ bu_log("CAERTESIAN_TRANSFORMATION_OPERATOR_3D axis3: %f, %f, %f\n", outz[0], outz[1], outz[2]);
+ bu_log("Scaling: x: %f, y: %f, z: %f\n", xm, ym, zm);
+
+ } else {
+ bu_log("identity matrix\n");
+ }
+ }
+ rt_db_free_internal(&comb_intern);
}
// Local Variables:
Added: brlcad/trunk/src/conv/step/g-step/Assembly_Product.h
===================================================================
--- brlcad/trunk/src/conv/step/g-step/Assembly_Product.h (rev 0)
+++ brlcad/trunk/src/conv/step/g-step/Assembly_Product.h 2013-09-23 19:53:31 UTC (rev 57845)
@@ -0,0 +1,47 @@
+/* Assembly_Product.h
+ * BRL-CAD
+ *
+ * Copyright (c) 2013 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file step/Assembly_Product.h
+ *
+ */
+
+#ifndef ASSEMBLY_PRODUCT_H_
+#define ASSEMBLY_PRODUCT_H_
+
+#include <map>
+
+#include "ON_Brep.h"
+
+STEPentity *Add_Assembly_Product(struct directory *dp,
+ struct db_i *dbip,
+ struct bu_ptbl *children,
+ std::map<struct directory *, STEPentity *> *comb_to_step,
+ Registry *registry,
+ InstMgr *instance_list);
+
+#endif /* ASSEMBLY_PRODUCT_H_ */
+/*
+ * Local Variables:
+ * tab-width: 8
+ * mode: C
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/src/conv/step/g-step/Assembly_Product.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: brlcad/trunk/src/conv/step/g-step/Comb_Tree.cpp
===================================================================
--- brlcad/trunk/src/conv/step/g-step/Comb_Tree.cpp 2013-09-23 19:47:59 UTC (rev 57844)
+++ brlcad/trunk/src/conv/step/g-step/Comb_Tree.cpp 2013-09-23 19:53:31 UTC (rev 57845)
@@ -32,25 +32,8 @@
#include "G_STEP_internal.h"
#include "STEPWrapper.h"
#include "ON_Brep.h"
+#include "Assembly_Product.h"
-STEPentity *
-Identity_AXIS2_PLACEMENT_3D(Registry *registry, InstMgr *instance_list) {
- SdaiCartesian_point *pnt = (SdaiCartesian_point *)registry->ObjCreate("CARTESIAN_POINT");
- XYZ_to_Cartesian_point(0.0, 0.0, 0.0, pnt);
- SdaiDirection *axis = (SdaiDirection *)registry->ObjCreate("DIRECTION");
- XYZ_to_Direction(0.0, 0.0, 1.0, axis);
- SdaiDirection *ref = (SdaiDirection *)registry->ObjCreate("DIRECTION");
- XYZ_to_Direction(1.0, 0.0, 0.0, ref);
- SdaiAxis2_placement_3d *placement = (SdaiAxis2_placement_3d *)registry->ObjCreate("AXIS2_PLACEMENT_3D");
- placement->location_(pnt);
- placement->axis_(axis);
- placement->ref_direction_(ref);
- instance_list->Append((STEPentity *)pnt, completeSE);
- instance_list->Append((STEPentity *)axis, completeSE);
- instance_list->Append((STEPentity *)ref, completeSE);
- instance_list->Append((STEPentity *)placement, completeSE);
- return (STEPentity *)placement;
-}
STEPentity *
Comb_to_STEP(struct directory *dp, Registry *registry, InstMgr *instance_list) {
@@ -161,6 +144,7 @@
non_wrapper_combs.insert(curr_dp);
bu_log("Comb non-wrapper (matrix over primitive): %s\n", curr_dp->d_namep);
}
+ rt_db_free_internal(&comb_intern);
}
/* For each non-wrapper comb, get list of immediate children and call Assembly Product,
@@ -173,67 +157,7 @@
for (std::set<struct directory *>::iterator it=non_wrapper_combs.begin(); it != non_wrapper_combs.end(); ++it) {
bu_log("look for matrices in %s\n", (*it)->d_namep);
struct bu_ptbl *comb_children = db_search_path_obj(comb_children_search, (*it), wdbp);
- struct rt_db_internal comb_intern;
- rt_db_get_internal(&comb_intern, (*it), wdbp->dbip, bn_mat_identity, &rt_uniresource);
- RT_CK_DB_INTERNAL(&comb_intern);
- struct rt_comb_internal *comb = (struct rt_comb_internal *)(comb_intern.idb_ptr);
- for (int j = (int)BU_PTBL_LEN(comb_children) - 1; j >= 0; j--){
- struct directory *curr_dp = (struct directory *)BU_PTBL_GET(comb_children, j);
- bu_log("%s under %s: ", curr_dp->d_namep, (*it)->d_namep);
- union tree *curr_node = db_find_named_leaf(comb->tree, curr_dp->d_namep);
- matp_t curr_matrix = curr_node->tr_l.tl_mat;
- if(curr_matrix) {
- bu_log(" - found matrix over %s in %s\n", curr_dp->d_namep, (*it)->d_namep);
- bn_mat_print(curr_dp->d_namep, curr_matrix);
-
- //TODO - investigate CARTESIAN_TRANSFORMATION_OPERATOR_3D, which seems to
- // allow uniform scaling as well and appears to be compatible with the
- // same slot used for AXIS2_PLACEMENT_3D - may be able to use the latter
- // for simple cases without scaling (i.e. VUNITIZE doesn't change the length
- // of X, Y or Z unit vectors after the matrix is applied), the former when
- // the there is uniform scaling (X, Y and Z lengths all change by the same
- // amount) and in the worst case (non-uniform scaling) will have to create
- // a new Brep and abandon the attempt to preserve the comb-level operation.
-
- vect_t inv, outv;
- VSET(inv, 0, 0, 0);
- MAT4X3PNT(outv, curr_matrix, inv);
- bu_log("AXIS2_PLACEMENT_3D cartesian_point: %f, %f, %f\n", outv[0], outv[1], outv[2]);
- VSET(inv, 0, 0, 1);
- MAT4X3VEC(outv, curr_matrix, inv);
- VUNITIZE(outv);
- bu_log("AXIS2_PLACEMENT_3D axis: %f, %f, %f\n", outv[0], outv[1], outv[2]);
- VSET(inv, 1, 0, 0);
- MAT4X3VEC(outv, curr_matrix, inv);
- VUNITIZE(outv);
- bu_log("AXIS2_PLACEMENT_3D ref axis: %f, %f, %f\n", outv[0], outv[1], outv[2]);
-
- vect_t outx, outy, outz;
- fastf_t xm, ym, zm;
- VSET(inv, 0, 0, 0);
- MAT4X3PNT(outv, curr_matrix, inv);
- bu_log("CAERTESIAN_TRANSFORMATION_OPERATOR_3D local_origin: %f, %f, %f\n", outv[0], outv[1], outv[2]);
- VSET(inv, 1, 0, 0);
- MAT4X3VEC(outx, curr_matrix, inv);
- xm = MAGNITUDE(outx);
- VUNITIZE(outx);
- bu_log("CAERTESIAN_TRANSFORMATION_OPERATOR_3D axis1: %f, %f, %f\n", outx[0], outx[1], outx[2]);
- VSET(inv, 0, 1, 0);
- MAT4X3VEC(outy, curr_matrix, inv);
- ym = MAGNITUDE(outy);
- VUNITIZE(outy);
- bu_log("CAERTESIAN_TRANSFORMATION_OPERATOR_3D axis2: %f, %f, %f\n", outy[0], outy[1], outy[2]);
- VSET(inv, 0, 0, 1);
- MAT4X3VEC(outz, curr_matrix, inv);
- zm = MAGNITUDE(outz);
- VUNITIZE(outz);
- bu_log("CAERTESIAN_TRANSFORMATION_OPERATOR_3D axis3: %f, %f, %f\n", outz[0], outz[1], outz[2]);
- bu_log("Scaling: x: %f, y: %f, z: %f\n", xm, ym, zm);
-
- } else {
- bu_log("identity matrix\n");
- }
- }
+ Add_Assembly_Product((*it), wdbp->dbip, comb_children, &comb_to_step, registry, instance_list);
bu_ptbl_free(comb_children);
bu_free(comb_children, "free search result");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|