[brlcad-commits] SF.net SVN: brlcad:[33252] brlcad/trunk
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2008-11-26 03:22:24
|
Revision: 33252 http://brlcad.svn.sourceforge.net/brlcad/?rev=33252&view=rev Author: starseeker Date: 2008-11-26 03:22:21 +0000 (Wed, 26 Nov 2008) Log Message: ----------- Make asc2g aware of hyp, add includes needed for this to work Modified Paths: -------------- brlcad/trunk/include/db.h brlcad/trunk/include/wdb.h brlcad/trunk/src/conv/asc2g.c Modified: brlcad/trunk/include/db.h =================================================================== --- brlcad/trunk/include/db.h 2008-11-26 03:06:12 UTC (rev 33251) +++ brlcad/trunk/include/db.h 2008-11-26 03:22:21 UTC (rev 33252) @@ -159,6 +159,7 @@ #define ETO 30 /* Elliptical Torus */ #define GRP 31 /* Grip pseudo solid */ #define SUPERELL 32 /* Superquadtratic Ellipsoid */ +#define HYP 33 /* Hyperboloid of one sheet */ char s_name[NAMESIZE]; /* unique name */ short s_cgtype; /* COMGEOM solid type */ #define RPP 1 /* axis-aligned rectangular parallelopiped */ Modified: brlcad/trunk/include/wdb.h =================================================================== --- brlcad/trunk/include/wdb.h 2008-11-26 03:06:12 UTC (rev 33251) +++ brlcad/trunk/include/wdb.h 2008-11-26 03:22:21 UTC (rev 33252) @@ -188,6 +188,14 @@ fastf_t r1, fastf_t r2, fastf_t c ); +WDB_EXPORT int mk_hyp( + struct rt_wdb *wdbp, + const char *name, + const point_t vert, + const vect_t height_vector, + const vect_t vectA, + fastf_t magB, + fastf_t base_neck_ratio ); WDB_EXPORT int mk_eto( struct rt_wdb *wdbp, const char *name, Modified: brlcad/trunk/src/conv/asc2g.c =================================================================== --- brlcad/trunk/src/conv/asc2g.c 2008-11-26 03:06:12 UTC (rev 33251) +++ brlcad/trunk/src/conv/asc2g.c 2008-11-26 03:22:21 UTC (rev 33252) @@ -661,6 +661,15 @@ mk_ehy(ofp, name, center, height, a, rad1, rad2, dd); break; + case HYP: + VSET(center, val[0], val[1], val[2]); + VSET(height, val[3], val[4], val[5]); + VSET(a, val[6], val[7], val[8]); + rad1 = val[9]; + rad2 = val[10]; + + mk_hyp(ofp, name, center, height, a, rad1, rad2); + case ETO: VSET(center, val[0], val[1], val[2]); VSET(norm, val[3], val[4], val[5]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |