Revision: 41780
http://brlcad.svn.sourceforge.net/brlcad/?rev=41780&view=rev
Author: starseeker
Date: 2010-12-22 19:52:47 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Make a stab at doing rt_*_brep functions the 'right way' through the functab.
Modified Paths:
--------------
brlcad/branches/cmake/include/raytrace.h
brlcad/branches/cmake/src/librt/primitives/arb8/arb8_brep.cpp
brlcad/branches/cmake/src/librt/primitives/table.c
brlcad/branches/cmake/src/librt/primitives/tor/tor_brep.cpp
brlcad/branches/cmake/src/proc-db/csgbrep.cpp
Modified: brlcad/branches/cmake/include/raytrace.h
===================================================================
--- brlcad/branches/cmake/include/raytrace.h 2010-12-22 18:35:39 UTC (rev
41779)
+++ brlcad/branches/cmake/include/raytrace.h 2010-12-22 19:52:47 UTC (rev
41780)
@@ -1999,6 +1999,9 @@
struct model * /*m*/,
struct rt_db_internal * /*ip*/,
const struct bn_tol * /*tol*/));
+ void (*ft_brep) BU_ARGS((ON_Brep ** /*b*/,
+ struct rt_db_internal * /*ip*/,
+ const struct bn_tol * /*tol*/));
int (*ft_import5) BU_ARGS((struct rt_db_internal * /*ip*/,
const struct bu_external * /*ep*/,
const mat_t /*mat*/,
Modified: brlcad/branches/cmake/src/librt/primitives/arb8/arb8_brep.cpp
===================================================================
--- brlcad/branches/cmake/src/librt/primitives/arb8/arb8_brep.cpp
2010-12-22 18:35:39 UTC (rev 41779)
+++ brlcad/branches/cmake/src/librt/primitives/arb8/arb8_brep.cpp
2010-12-22 19:52:47 UTC (rev 41780)
@@ -40,7 +40,7 @@
* R T _ A R B 8 _ B R E P
*/
extern "C" void
-rt_arb8_brep(ON_Brep **b, const struct rt_db_internal *ip, const struct bn_tol
*tol)
+rt_arb_brep(ON_Brep **b, const struct rt_db_internal *ip, const struct bn_tol
*tol)
{
struct rt_db_internal *tmp_internal = (struct rt_db_internal *)
bu_malloc(sizeof(struct rt_db_internal), "allocate structure");
RT_INIT_DB_INTERNAL(tmp_internal);
Modified: brlcad/branches/cmake/src/librt/primitives/table.c
===================================================================
--- brlcad/branches/cmake/src/librt/primitives/table.c 2010-12-22 18:35:39 UTC
(rev 41779)
+++ brlcad/branches/cmake/src/librt/primitives/table.c 2010-12-22 19:52:47 UTC
(rev 41780)
@@ -56,6 +56,7 @@
BU_EXTERN(void rt_##name##_vshot, (struct soltab *stp[], struct xray
*rp[], struct seg *segp, int n, struct application *ap)); \
BU_EXTERN(int rt_##name##_tess, (struct nmgregion **r, struct model *m,
struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol
*tol)); \
BU_EXTERN(int rt_##name##_tnurb, (struct nmgregion **r, struct model
*m, struct rt_db_internal *ip, const struct bn_tol *tol)); \
+ BU_EXTERN(void rt_##name##_brep, (ON_Brep **b, struct rt_db_internal
*ip, const struct bn_tol *tol)); \
BU_EXTERN(int rt_##name##_import5, (struct rt_db_internal *ip, const
struct bu_external *ep, const mat_t mat, const struct db_i *dbip, struct
resource *resp)); \
BU_EXTERN(int rt_##name##_export5, (struct bu_external *ep, const
struct rt_db_internal *ip, double local2mm, const struct db_i *dbip, struct
resource *resp)); \
BU_EXTERN(int rt_##name##_import4, (struct rt_db_internal *ip, const
struct bu_external *ep, const mat_t mat, const struct db_i *dbip, struct
resource *resp)); \
@@ -172,6 +173,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0,
NULL,
@@ -199,6 +201,7 @@
rt_tor_vshot,
rt_tor_tess,
NULL,
+ rt_tor_brep,
rt_tor_import5,
rt_tor_export5,
rt_tor_import4,
@@ -234,6 +237,7 @@
rt_tgc_vshot,
rt_tgc_tess,
rt_tgc_tnurb,
+ rt_tgc_brep,
rt_tgc_import5,
rt_tgc_export5,
rt_tgc_import4,
@@ -269,6 +273,7 @@
rt_ell_vshot,
rt_ell_tess,
rt_ell_tnurb,
+ rt_ell_brep,
rt_ell_import5,
rt_ell_export5,
rt_ell_import4,
@@ -304,6 +309,7 @@
rt_arb_vshot,
rt_arb_tess,
rt_arb_tnurb,
+ rt_arb_brep,
rt_arb_import5,
rt_arb_export5,
rt_arb_import4,
@@ -339,6 +345,7 @@
NULL,
rt_ars_tess,
NULL,
+ NULL,
rt_ars_import5,
rt_ars_export5,
rt_ars_import4,
@@ -374,6 +381,7 @@
rt_hlf_vshot,
rt_hlf_tess,
NULL,
+ NULL,
rt_hlf_import5,
rt_hlf_export5,
rt_hlf_import4,
@@ -409,6 +417,7 @@
rt_rec_vshot,
rt_tgc_tess,
NULL,
+ rt_tgc_brep,
rt_tgc_import5,
rt_tgc_export5,
rt_tgc_import4,
@@ -446,6 +455,7 @@
NULL,
NULL,
NULL,
+ NULL,
rt_pg_import4,
rt_pg_export4,
rt_pg_ifree,
@@ -479,6 +489,7 @@
NULL,
rt_nurb_tess,
NULL,
+ NULL,
rt_nurb_import5,
rt_nurb_export5,
rt_nurb_import4,
@@ -514,6 +525,7 @@
rt_sph_vshot,
rt_ell_tess,
rt_ell_tnurb,
+ rt_ell_brep,
rt_ell_import5,
rt_ell_export5,
rt_ell_import4,
@@ -549,6 +561,7 @@
NULL,
rt_nmg_tess,
NULL,
+ rt_nmg_brep,
rt_nmg_import5,
rt_nmg_export5,
rt_nmg_import4,
@@ -584,6 +597,7 @@
NULL,
rt_ebm_tess,
NULL,
+ rt_ebm_brep,
rt_ebm_import5,
rt_ebm_export5,
rt_ebm_import4,
@@ -619,6 +633,7 @@
NULL,
rt_vol_tess,
NULL,
+ rt_vol_brep,
rt_vol_import5,
rt_vol_export5,
rt_vol_import4,
@@ -654,6 +669,7 @@
NULL,
rt_arbn_tess,
NULL,
+ rt_arbn_brep,
rt_arbn_import5,
rt_arbn_export5,
rt_arbn_import4,
@@ -689,6 +705,7 @@
NULL,
rt_pipe_tess,
NULL,
+ rt_pipe_brep,
rt_pipe_import5,
rt_pipe_export5,
rt_pipe_import4,
@@ -724,6 +741,7 @@
NULL,
rt_part_tess,
NULL,
+ NULL,
rt_part_import5,
rt_part_export5,
rt_part_import4,
@@ -759,6 +777,7 @@
NULL,
rt_rpc_tess,
NULL,
+ rt_rpc_brep,
rt_rpc_import5,
rt_rpc_export5,
rt_rpc_import4,
@@ -794,6 +813,7 @@
NULL,
rt_rhc_tess,
NULL,
+ rt_rhc_brep,
rt_rhc_import5,
rt_rhc_export5,
rt_rhc_import4,
@@ -829,6 +849,7 @@
NULL,
rt_epa_tess,
NULL,
+ rt_epa_brep,
rt_epa_import5,
rt_epa_export5,
rt_epa_import4,
@@ -864,6 +885,7 @@
NULL,
rt_ehy_tess,
NULL,
+ rt_ehy_brep,
rt_ehy_import5,
rt_ehy_export5,
rt_ehy_import4,
@@ -899,6 +921,7 @@
NULL,
rt_eto_tess,
NULL,
+ rt_eto_brep,
rt_eto_import5,
rt_eto_export5,
rt_eto_import4,
@@ -934,6 +957,7 @@
NULL,
rt_grp_tess,
NULL,
+ NULL,
rt_grp_import5,
rt_grp_export5,
rt_grp_import4,
@@ -977,6 +1001,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0,
NULL,
@@ -1004,6 +1029,7 @@
NULL,
rt_hf_tess,
NULL,
+ NULL,
rt_hf_import5,
rt_hf_export5,
rt_hf_import4,
@@ -1039,6 +1065,7 @@
NULL,
rt_dsp_tess,
NULL,
+ rt_dsp_brep,
rt_dsp_import5,
rt_dsp_export5,
rt_dsp_import4,
@@ -1074,6 +1101,7 @@
NULL,
NULL,
NULL,
+ rt_sketch_brep,
rt_sketch_import5,
rt_sketch_export5,
rt_sketch_import4,
@@ -1109,6 +1137,7 @@
NULL,
rt_extrude_tess,
NULL,
+ rt_extrude_brep,
rt_extrude_import5,
rt_extrude_export5,
rt_extrude_import4,
@@ -1144,6 +1173,7 @@
NULL,
rt_submodel_tess,
NULL,
+ NULL,
rt_submodel_import5,
rt_submodel_export5,
rt_submodel_import4,
@@ -1179,6 +1209,7 @@
NULL,
rt_cline_tess,
NULL,
+ NULL,
rt_cline_import5,
rt_cline_export5,
rt_cline_import4,
@@ -1214,6 +1245,7 @@
NULL,
rt_bot_tess,
NULL,
+ rt_bot_brep,
rt_bot_import5,
rt_bot_export5,
rt_bot_import4,
@@ -1249,6 +1281,7 @@
NULL,
NULL,
NULL,
+ NULL,
rt_comb_import5,
rt_comb_export5,
rt_comb_import4,
@@ -1294,6 +1327,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0,
NULL,
@@ -1322,6 +1356,7 @@
NULL,
NULL,
NULL,
+ NULL,
rt_binunif_export5,
NULL,
NULL,
@@ -1366,6 +1401,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0,
NULL,
@@ -1393,6 +1429,7 @@
NULL,
rt_superell_tess,
NULL,
+ NULL,
rt_superell_import5,
rt_superell_export5,
rt_superell_import4,
@@ -1428,6 +1465,7 @@
NULL,
rt_metaball_tess,
NULL,
+ NULL,
rt_metaball_import5,
rt_metaball_export5,
NULL,
@@ -1464,6 +1502,7 @@
NULL,
rt_brep_tess,
NULL,
+ NULL,
rt_brep_import5,
rt_brep_export5,
NULL,
@@ -1507,6 +1546,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0,
NULL,
@@ -1535,6 +1575,7 @@
NULL,
rt_hyp_tess,
NULL,
+ rt_hyp_brep,
rt_hyp_import5,
rt_hyp_export5,
NULL,
@@ -1570,6 +1611,7 @@
NULL,
NULL,
NULL,
+ NULL,
rt_constraint_import5,
rt_constraint_export5,
NULL,
@@ -1605,6 +1647,7 @@
NULL,
rt_revolve_tess,
NULL,
+ rt_revolve_brep,
rt_revolve_import5,
rt_revolve_export5,
NULL,
@@ -1640,6 +1683,7 @@
NULL,
NULL,
NULL,
+ NULL,
rt_pnts_import5,
rt_pnts_export5,
NULL,
@@ -1683,6 +1727,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0,
NULL,
Modified: brlcad/branches/cmake/src/librt/primitives/tor/tor_brep.cpp
===================================================================
--- brlcad/branches/cmake/src/librt/primitives/tor/tor_brep.cpp 2010-12-22
18:35:39 UTC (rev 41779)
+++ brlcad/branches/cmake/src/librt/primitives/tor/tor_brep.cpp 2010-12-22
19:52:47 UTC (rev 41780)
@@ -31,7 +31,7 @@
extern "C" void
-rt_tor_brep(ON_Brep **b, const struct rt_db_internal *ip, const struct bn_tol
*)
+rt_tor_brep(ON_Brep **b, const struct rt_db_internal *ip, const struct bn_tol
*tol)
{
struct rt_tor_internal *tip;
Modified: brlcad/branches/cmake/src/proc-db/csgbrep.cpp
===================================================================
--- brlcad/branches/cmake/src/proc-db/csgbrep.cpp 2010-12-22 18:35:39 UTC
(rev 41779)
+++ brlcad/branches/cmake/src/proc-db/csgbrep.cpp 2010-12-22 19:52:47 UTC
(rev 41780)
@@ -43,29 +43,6 @@
#include "vmath.h" /* BRL-CAD Vector macros */
#include "wdb.h"
- /* FIXME: go through the table interface since these are not
- * external symbols available to calling applications.
- */
- extern void rt_arb_tess(struct nmgregion **r, struct model *m, struct
rt_db_internal *ip, const struct rt_tess_tol *ttol,const struct bn_tol *tol);
- extern void rt_arb8_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_arbn_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_nmg_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_sph_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_ell_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_eto_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_rhc_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_rpc_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_epa_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_ehy_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_hyp_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_tgc_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_tor_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_pipe_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_sketch_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_sketch_ifree(struct rt_db_internal *ip, struct resource
*resp);
- extern void rt_extrude_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_revolve_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
- extern void rt_dsp_brep(ON_Brep **bi, struct rt_db_internal *ip, const
struct bn_tol *tol);
#ifdef __cplusplus
}
@@ -114,7 +91,7 @@
VMOVE( arb4->pt[i], ptarb4[i] );
}
tmp_internal->idb_ptr = (genptr_t)arb4;
- rt_arb8_brep(&arb4brep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&arb4brep, tmp_internal, tol);
const char* arb4_name = "arb4_nurb.s";
mk_brep(outfp, arb4_name, arb4brep);
delete arb4brep;
@@ -137,7 +114,7 @@
VMOVE( arb5->pt[i], ptarb5[i] );
}
tmp_internal->idb_ptr = (genptr_t)arb5;
- rt_arb8_brep(&arb5brep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&arb5brep, tmp_internal, tol);
const char* arb5_name = "arb5_nurb.s";
mk_brep(outfp, arb5_name, arb5brep);
delete arb5brep;
@@ -160,7 +137,7 @@
VMOVE( arb6->pt[i], ptarb6[i] );
}
tmp_internal->idb_ptr = (genptr_t)arb6;
- rt_arb8_brep(&arb6brep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&arb6brep, tmp_internal, tol);
const char* arb6_name = "arb6_nurb.s";
mk_brep(outfp, arb6_name, arb6brep);
delete arb6brep;
@@ -183,7 +160,7 @@
VMOVE( arb7->pt[i], ptarb7[i] );
}
tmp_internal->idb_ptr = (genptr_t)arb7;
- rt_arb8_brep(&arb7brep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&arb7brep, tmp_internal, tol);
const char* arb7_name = "arb7_nurb.s";
mk_brep(outfp, arb7_name, arb7brep);
delete arb7brep;
@@ -206,7 +183,7 @@
VMOVE( arb8->pt[i], pt8[i] );
}
tmp_internal->idb_ptr = (genptr_t)arb8;
- rt_arb8_brep(&arb8brep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&arb8brep, tmp_internal, tol);
const char* arb8_name = "arb8_nurb.s";
mk_brep(outfp, arb8_name, arb8brep);
delete arb8brep;
@@ -239,7 +216,7 @@
arbn->eqn[6][3] = 1000;
VSET(arbn->eqn[7], -0.57735, -0.57735, -0.57735);
arbn->eqn[7][3] = 1000;
- rt_arbn_brep(&arbnbrep, &arbninternal, tol);
+ tmp_internal->idb_meth->ft_brep(&arbnbrep, &arbninternal, tol);
const char* arbn_name = "arbn_nurb.s";
mk_brep(outfp, arbn_name, arbnbrep);
bu_free(arbn->eqn, "free arbn eqn");
@@ -273,9 +250,9 @@
// Now, need nmg form of the arb
struct model *m = nmg_mm();
struct nmgregion *r;
- rt_arb_tess(&r, m, tmp_internal, ttol, tol);
+ tmp_internal->idb_meth->ft_tessellate(&r, m, tmp_internal, ttol, tol);
tmp_internal->idb_ptr = (genptr_t)m;
- rt_nmg_brep(&nmgbrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&nmgbrep, tmp_internal, tol);
const char* nmg_name = "nmg_nurb.s";
mk_brep(outfp, nmg_name, nmgbrep);
FREE_MODEL(m);
@@ -296,7 +273,7 @@
VMOVE(sph->b, b);
VMOVE(sph->c, c);
tmp_internal->idb_ptr = (genptr_t)sph;
- rt_sph_brep(&sphbrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&sphbrep, tmp_internal, tol);
const char* sph_name = "sph_nurb.s";
mk_brep(outfp, sph_name, sphbrep);
delete sphbrep;
@@ -315,7 +292,7 @@
VMOVE(ell->b, b);
VMOVE(ell->c, c);
tmp_internal->idb_ptr = (genptr_t)ell;
- rt_ell_brep(&ellbrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&ellbrep, tmp_internal, tol);
const char* ell_name = "ell_nurb.s";
mk_brep(outfp, ell_name, ellbrep);
delete ellbrep;
@@ -331,7 +308,7 @@
rhc->rhc_r = 1000;
rhc->rhc_c = 400;
tmp_internal->idb_ptr = (genptr_t)rhc;
- rt_rhc_brep(&rhcbrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&rhcbrep, tmp_internal, tol);
const char* rhc_name = "rhc_nurb.s";
mk_brep(outfp, rhc_name, rhcbrep);
delete rhcbrep;
@@ -348,7 +325,7 @@
VSCALE(rpc->rpc_B, rpc->rpc_B, 2000);
rpc->rpc_r = 1000;
tmp_internal->idb_ptr = (genptr_t)rpc;
- rt_rpc_brep(&rpcbrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&rpcbrep, tmp_internal, tol);
const char* rpc_name = "rpc_nurb.s";
mk_brep(outfp, rpc_name, rpcbrep);
delete rpcbrep;
@@ -364,7 +341,7 @@
epa->epa_r1 = 1000;
epa->epa_r2 = 500;
tmp_internal->idb_ptr = (genptr_t)epa;
- rt_epa_brep(&epabrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&epabrep, tmp_internal, tol);
const char* epa_name = "epa_nurb.s";
mk_brep(outfp, epa_name, epabrep);
delete epabrep;
@@ -381,7 +358,7 @@
ehy->ehy_r2 = 500;
ehy->ehy_c = 400;
tmp_internal->idb_ptr = (genptr_t)ehy;
- rt_ehy_brep(&ehybrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&ehybrep, tmp_internal, tol);
const char* ehy_name = "ehy_nurb.s";
mk_brep(outfp, ehy_name, ehybrep);
delete ehybrep;
@@ -397,7 +374,7 @@
hyp->hyp_b = 50;
hyp->hyp_bnr = 0.5;
tmp_internal->idb_ptr = (genptr_t)hyp;
- rt_hyp_brep(&hypbrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&hypbrep, tmp_internal, tol);
const char* hyp_name = "hyp_nurb.s";
mk_brep(outfp, hyp_name, hypbrep);
delete hypbrep;
@@ -414,7 +391,7 @@
VSET(tgc->c, 250, 0, 0);
VSET(tgc->d, 0, 500, 0);
tmp_internal->idb_ptr = (genptr_t)tgc;
- rt_tgc_brep(&tgcbrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&tgcbrep, tmp_internal, tol);
const char* tgc_name = "tgc_nurb.s";
mk_brep(outfp, tgc_name, tgcbrep);
delete tgcbrep;
@@ -431,7 +408,7 @@
tor->r_a = 5.0;
tor->r_h = 2.0;
tmp_internal->idb_ptr = (genptr_t)tor;
- rt_tor_brep(&torbrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&torbrep, tmp_internal, tol);
const char* tor_name = "tor_nurb.s";
mk_brep(outfp, tor_name, torbrep);
delete torbrep;
@@ -450,7 +427,7 @@
eto->eto_r = 800;
eto->eto_rd = 100;
tmp_internal->idb_ptr = (genptr_t)eto;
- rt_eto_brep(&etobrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&etobrep, tmp_internal, tol);
const char* eto_name = "eto_nurb.s";
mk_brep(outfp, eto_name, etobrep);
delete etobrep;
@@ -490,7 +467,7 @@
BU_LIST_INSERT(&pipe->pipe_segs_head, &pipe1[i].l);
}
tmp_internal->idb_ptr = (genptr_t)pipe;
- rt_pipe_brep(&pipebrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&pipebrep, tmp_internal, tol);
const char* pipe_name = "pipe_nurb.s";
mk_brep(outfp, pipe_name, pipebrep);
// delete pipebrep;
@@ -582,7 +559,7 @@
tmp_internal->idb_ptr = (genptr_t)skt;
- rt_sketch_brep(&sketchbrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&sketchbrep, tmp_internal, tol);
const char* sketch_name = "sketch_nurb.s";
mk_brep(outfp, sketch_name, sketchbrep);
//delete sketchbrep;
@@ -686,7 +663,7 @@
extrude->sketch_name = esketch_name;
extrude->skt = eskt;
tmp_internal->idb_ptr = (genptr_t)extrude;
- rt_extrude_brep(&extrudebrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&extrudebrep, tmp_internal, tol);
const char* extrude_name = "extrude_nurb.s";
mk_brep(outfp, extrude_name, extrudebrep);
// delete extrudebrep;
@@ -786,7 +763,7 @@
//revolve->sketch_name = rsketch_name;
revolve->sk = rskt;
tmp_internal->idb_ptr = (genptr_t)revolve;
- rt_revolve_brep(&revolvebrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&revolvebrep, tmp_internal, tol);
const char* revolve_name = "revolve_nurb.s";
mk_brep(outfp, revolve_name, revolvebrep);
// delete revolvebrep;
@@ -807,7 +784,7 @@
MAT_IDN(dsp->dsp_mtos);
MAT_IDN(dsp->dsp_stom);
tmp_internal->idb_ptr = (genptr_t)dsp;
- rt_dsp_brep(&dspbrep, tmp_internal, tol);
+ tmp_internal->idb_meth->ft_brep(&dspbrep, tmp_internal, tol);
const char* dsp_name = "dsp_nurb.s";
mk_brep(outfp, dsp_name, dspbrep);
delete dspbrep;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
