[brlcad-commits] SF.net SVN: brlcad:[34489] brlcad/trunk/src/libged
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <bo...@us...> - 2009-05-11 15:18:12
|
Revision: 34489 http://brlcad.svn.sourceforge.net/brlcad/?rev=34489&view=rev Author: bob1961 Date: 2009-05-11 15:17:58 +0000 (Mon, 11 May 2009) Log Message: ----------- Included rtgeom.h in ged_private.h, modified the signatures of ged_scale_ell() and ged_scale_tor() (i.e. removed matp_t parameter). Also fixed pscale (it wasn't working when matrices were found along the path). Modified Paths: -------------- brlcad/trunk/src/libged/ged_private.h brlcad/trunk/src/libged/pscale.c brlcad/trunk/src/libged/scale_ell.c brlcad/trunk/src/libged/scale_tor.c Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2009-05-11 13:45:33 UTC (rev 34488) +++ brlcad/trunk/src/libged/ged_private.h 2009-05-11 15:17:58 UTC (rev 34489) @@ -32,6 +32,7 @@ #include "db.h" #include "mater.h" +#include "rtgeom.h" #include "ged.h" __BEGIN_DECLS @@ -336,16 +337,14 @@ (struct ged *gedp, struct rt_ell_internal *ell, char *attribute, - fastf_t sf, - matp_t mat)); + fastf_t sf)); /* defined in scale_tor.c */ BU_EXTERN (int ged_scale_tor, (struct ged *gedp, struct rt_tor_internal *tor, char *attribute, - fastf_t sf, - matp_t mat)); + fastf_t sf)); /* defined in tops.c */ struct directory ** Modified: brlcad/trunk/src/libged/pscale.c =================================================================== --- brlcad/trunk/src/libged/pscale.c 2009-05-11 13:45:33 UTC (rev 34488) +++ brlcad/trunk/src/libged/pscale.c 2009-05-11 15:17:58 UTC (rev 34489) @@ -97,8 +97,8 @@ return BRLCAD_ERROR; } - if (wdb_import_from_path2(&gedp->ged_result_str, &intern, argv[1], gedp->ged_wdbp, mat) == BRLCAD_ERROR) - return BRLCAD_ERROR; + GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, BRLCAD_ERROR); + RT_CK_DB_INTERNAL(&intern); if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD) { bu_vls_printf(&gedp->ged_result_str, "Object not eligible for scaling."); @@ -109,10 +109,10 @@ switch (intern.idb_minor_type) { case DB5_MINORTYPE_BRLCAD_ELL: - ret = ged_scale_ell(gedp, (struct rt_ell_internal *)intern.idb_ptr, argv[2], sf, mat); + ret = ged_scale_ell(gedp, (struct rt_ell_internal *)intern.idb_ptr, argv[2], sf); break; case DB5_MINORTYPE_BRLCAD_TOR: - ret = ged_scale_tor(gedp, (struct rt_tor_internal *)intern.idb_ptr, argv[2], sf, mat); + ret = ged_scale_tor(gedp, (struct rt_tor_internal *)intern.idb_ptr, argv[2], sf); break; default: bu_vls_printf(&gedp->ged_result_str, "Object not yet supported."); Modified: brlcad/trunk/src/libged/scale_ell.c =================================================================== --- brlcad/trunk/src/libged/scale_ell.c 2009-05-11 13:45:33 UTC (rev 34488) +++ brlcad/trunk/src/libged/scale_ell.c 2009-05-11 15:17:58 UTC (rev 34489) @@ -42,7 +42,7 @@ #include "./ged_private.h" int -ged_scale_ell(struct ged *gedp, struct rt_ell_internal *ell, char *attribute, fastf_t sf, matp_t mat) +ged_scale_ell(struct ged *gedp, struct rt_ell_internal *ell, char *attribute, fastf_t sf) { fastf_t ma, mb; Modified: brlcad/trunk/src/libged/scale_tor.c =================================================================== --- brlcad/trunk/src/libged/scale_tor.c 2009-05-11 13:45:33 UTC (rev 34488) +++ brlcad/trunk/src/libged/scale_tor.c 2009-05-11 15:17:58 UTC (rev 34489) @@ -36,7 +36,7 @@ int -ged_scale_tor(struct ged *gedp, struct rt_tor_internal *tor, char *attribute, fastf_t sf, matp_t mat) +ged_scale_tor(struct ged *gedp, struct rt_tor_internal *tor, char *attribute, fastf_t sf) { RT_TOR_CK_MAGIC(tor); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |