Revision: 56157
http://sourceforge.net/p/brlcad/code/56157
Author: brlcad
Date: 2013-07-20 04:47:53 +0000 (Sat, 20 Jul 2013)
Log Message:
-----------
ws tab cleanup
Modified Paths:
--------------
brlcad/trunk/include/rtgeom.h
Modified: brlcad/trunk/include/rtgeom.h
===================================================================
--- brlcad/trunk/include/rtgeom.h 2013-07-20 04:40:27 UTC (rev 56156)
+++ brlcad/trunk/include/rtgeom.h 2013-07-20 04:47:53 UTC (rev 56157)
@@ -47,60 +47,60 @@
#define NAMELEN 16 /* NAMESIZE from db.h (can't call it NAMESIZE!!!!!) */
/*
- * ID_TOR
+ * ID_TOR
*/
struct rt_tor_internal {
uint32_t magic;
- point_t v; /**< @brief center point */
- vect_t h; /**< @brief normal, unit length */
- fastf_t r_h; /**< @brief radius in H direction (r2) */
- fastf_t r_a; /**< @brief radius in A direction (r1) */
+ point_t v; /**< @brief center point */
+ vect_t h; /**< @brief normal, unit length */
+ fastf_t r_h; /**< @brief radius in H direction (r2) */
+ fastf_t r_a; /**< @brief radius in A direction (r1) */
/* REMAINING ELEMENTS PROVIDED BY IMPORT, UNUSED BY EXPORT */
- vect_t a; /**< @brief r_a length */
- vect_t b; /**< @brief r_b length */
- fastf_t r_b; /**< @brief radius in B direction (typ == r_a)
*/
+ vect_t a; /**< @brief r_a length */
+ vect_t b; /**< @brief r_b length */
+ fastf_t r_b; /**< @brief radius in B direction (typ == r_a) */
};
-#define RT_TOR_CK_MAGIC(_p) BU_CKMAG(_p, RT_TOR_INTERNAL_MAGIC,
"rt_tor_internal")
+#define RT_TOR_CK_MAGIC(_p) BU_CKMAG(_p, RT_TOR_INTERNAL_MAGIC,
"rt_tor_internal")
/**
- * ID_TGC and ID_REC
+ * ID_TGC and ID_REC
*/
struct rt_tgc_internal {
uint32_t magic;
- point_t v;
- vect_t h;
- vect_t a;
- vect_t b;
- vect_t c;
- vect_t d;
+ point_t v;
+ vect_t h;
+ vect_t a;
+ vect_t b;
+ vect_t c;
+ vect_t d;
};
-#define RT_TGC_CK_MAGIC(_p) BU_CKMAG(_p, RT_TGC_INTERNAL_MAGIC,
"rt_tgc_internal")
+#define RT_TGC_CK_MAGIC(_p) BU_CKMAG(_p, RT_TGC_INTERNAL_MAGIC,
"rt_tgc_internal")
/*
- * ID_ELL, and ID_SPH
+ * ID_ELL, and ID_SPH
*/
-struct rt_ell_internal {
+struct rt_ell_internal {
uint32_t magic;
- point_t v; /**< @brief center point */
- vect_t a; /**< @brief axis a radial length */
- vect_t b; /**< @brief axis b radial length */
- vect_t c; /**< @brief axis c radial length */
+ point_t v; /**< @brief center point */
+ vect_t a; /**< @brief axis a radial length */
+ vect_t b; /**< @brief axis b radial length */
+ vect_t c; /**< @brief axis c radial length */
};
-#define RT_ELL_CK_MAGIC(_p) BU_CKMAG(_p, RT_ELL_INTERNAL_MAGIC,
"rt_ell_internal")
+#define RT_ELL_CK_MAGIC(_p) BU_CKMAG(_p, RT_ELL_INTERNAL_MAGIC,
"rt_ell_internal")
/*
- * ID_SUPERELL
+ * ID_SUPERELL
*/
struct rt_superell_internal {
uint32_t magic;
point_t v;
- vect_t a;
- vect_t b;
- vect_t c;
+ vect_t a;
+ vect_t b;
+ vect_t c;
double n;
double e;
};
-#define RT_SUPERELL_CK_MAGIC(_p) BU_CKMAG(_p,
RT_SUPERELL_INTERNAL_MAGIC, "rt_superell_internal")
+#define RT_SUPERELL_CK_MAGIC(_p) BU_CKMAG(_p, RT_SUPERELL_INTERNAL_MAGIC,
"rt_superell_internal")
/**
* ID_METABALL
@@ -113,16 +113,16 @@
* There are three method ID's defined:
*
* 1. "metaball", which is the Tokyo Metaball approximation of the
- * Blinn Blobby Surface. This method is not implemented yet.
+ * Blinn Blobby Surface. This method is not implemented yet.
*
* 2. "blob", the Blinn method.
*
* 3. "iso", which is a simple computation like you'd see for
- * computing gravitational magnitude or point charge in a basic
- * physics course. Blending function in latex notation is:
+ * computing gravitational magnitude or point charge in a basic
+ * physics course. Blending function in latex notation is:
*
@code
- \Sum_{i}\frac{f_{i}}{d^{2}}
+ \Sum_{i}\frac{f_{i}}{d^{2}}
@endcode
*
* The surface of the primitive exists where the summation of the
@@ -136,192 +136,192 @@
struct rt_metaball_internal {
uint32_t magic;
/* these three defines are used with the method field */
-#define METABALL_METABALL 0
+#define METABALL_METABALL 0
#define METABALL_ISOPOTENTIAL 1
-#define METABALL_BLOB 2
- int method;
+#define METABALL_BLOB 2
+ int method;
fastf_t threshold;
fastf_t initstep;
fastf_t finalstep; /* for raytrace stepping. */
struct bu_list metaball_ctrl_head;
};
-#define RT_METABALL_CK_MAGIC(_p) BU_CKMAG(_p,
RT_METABALL_INTERNAL_MAGIC, "rt_metaball_internal")
+#define RT_METABALL_CK_MAGIC(_p) BU_CKMAG(_p, RT_METABALL_INTERNAL_MAGIC,
"rt_metaball_internal")
/*
- * ID_ARB8
+ * ID_ARB8
*
- * The internal (in memory) form of an ARB8 -- 8 points in space.
- * The first 4 form the "bottom" face, the second 4 form the "top" face.
+ * The internal (in memory) form of an ARB8 -- 8 points in space.
+ * The first 4 form the "bottom" face, the second 4 form the "top" face.
*/
struct rt_arb_internal {
uint32_t magic;
- point_t pt[8];
+ point_t pt[8];
};
-#define RT_ARB_CK_MAGIC(_p) BU_CKMAG(_p, RT_ARB_INTERNAL_MAGIC,
"rt_arb_internal")
+#define RT_ARB_CK_MAGIC(_p) BU_CKMAG(_p, RT_ARB_INTERNAL_MAGIC,
"rt_arb_internal")
/*
- * ID_ARS
+ * ID_ARS
*/
struct rt_ars_internal {
uint32_t magic;
size_t ncurves;
size_t pts_per_curve;
- fastf_t **curves;
+ fastf_t **curves;
};
-#define RT_ARS_CK_MAGIC(_p) BU_CKMAG(_p, RT_ARS_INTERNAL_MAGIC,
"rt_ars_internal")
+#define RT_ARS_CK_MAGIC(_p) BU_CKMAG(_p, RT_ARS_INTERNAL_MAGIC,
"rt_ars_internal")
/*
- * ID_HALF
+ * ID_HALF
*/
-struct rt_half_internal {
+struct rt_half_internal {
uint32_t magic;
- plane_t eqn;
+ plane_t eqn;
};
-#define RT_HALF_CK_MAGIC(_p) BU_CKMAG(_p, RT_HALF_INTERNAL_MAGIC,
"rt_half_internal")
+#define RT_HALF_CK_MAGIC(_p) BU_CKMAG(_p, RT_HALF_INTERNAL_MAGIC,
"rt_half_internal")
/*
- * ID_GRIP
+ * ID_GRIP
*/
struct rt_grip_internal {
uint32_t magic;
- point_t center;
+ point_t center;
/* Remaining elements are used for display purposes only */
- vect_t normal;
- fastf_t mag;
+ vect_t normal;
+ fastf_t mag;
};
-#define RT_GRIP_CK_MAGIC(_p) BU_CKMAG(_p, RT_GRIP_INTERNAL_MAGIC,
"rt_grip_internal")
+#define RT_GRIP_CK_MAGIC(_p) BU_CKMAG(_p, RT_GRIP_INTERNAL_MAGIC,
"rt_grip_internal")
/**
- * ID_POLY
+ * ID_POLY
*/
struct rt_pg_internal {
uint32_t magic;
size_t npoly;
struct rt_pg_face_internal {
- size_t npts; /**< @brief number of points for this polygon
*/
- fastf_t *verts; /**< @brief has 3*npts elements */
- fastf_t *norms; /**< @brief has 3*npts elements */
- } *poly; /**< @brief has npoly elements */
+ size_t npts; /**< @brief number of points for this polygon */
+ fastf_t *verts; /**< @brief has 3*npts elements */
+ fastf_t *norms; /**< @brief has 3*npts elements */
+ } *poly; /**< @brief has npoly elements */
/* REMAINING ELEMENTS PROVIDED BY IMPORT, UNUSED BY EXPORT */
- size_t max_npts; /**< @brief maximum value of npts in poly[] */
+ size_t max_npts; /**< @brief maximum value of npts in poly[] */
};
-#define RT_PG_CK_MAGIC(_p) BU_CKMAG(_p, RT_PG_INTERNAL_MAGIC,
"rt_pg_internal")
+#define RT_PG_CK_MAGIC(_p) BU_CKMAG(_p, RT_PG_INTERNAL_MAGIC, "rt_pg_internal")
/* ID_BSPLINE */
struct rt_nurb_internal {
uint32_t magic;
- int nsrf; /**< @brief number of surfaces */
- struct face_g_snurb **srfs; /**< @brief The surfaces themselves */
+ int nsrf; /**< @brief number of surfaces */
+ struct face_g_snurb **srfs; /**< @brief The surfaces themselves */
#ifdef CONVERT_TO_BREP
ON_Brep *brep;
#endif
};
-#define RT_NURB_CK_MAGIC( _p) BU_CKMAG(_p, RT_NURB_INTERNAL_MAGIC,
"rt_nurb_internal");
+
+#define RT_NURB_CK_MAGIC(_p) BU_CKMAG(_p, RT_NURB_INTERNAL_MAGIC,
"rt_nurb_internal");
#define RT_NURB_GET_CONTROL_POINT(_s, _u, _v) ((_s)->ctl_points[ \
- ((_v)*(_s)->s_size[0]+(_u))*RT_NURB_EXTRACT_COORDS((_s)->pt_type)])
+
((_v)*(_s)->s_size[0]+(_u))*RT_NURB_EXTRACT_COORDS((_s)->pt_type)])
/* ID_BREP */
struct rt_brep_internal {
uint32_t magic;
- ON_Brep* brep; /**< @brief An openNURBS brep object containing the solid
*/
+ ON_Brep* brep; /**< @brief An openNURBS brep object containing the solid */
};
-#define RT_BREP_CK_MAGIC( _p) BU_CKMAG(_p, RT_BREP_INTERNAL_MAGIC,
"rt_brep_internal");
-#define RT_BREP_TEST_MAGIC( _p) ((_p) && (*((uint32_t *)(_p)) ==
(uint32_t)(RT_BREP_INTERNAL_MAGIC)))
+#define RT_BREP_CK_MAGIC(_p) BU_CKMAG(_p, RT_BREP_INTERNAL_MAGIC,
"rt_brep_internal");
+#define RT_BREP_TEST_MAGIC(_p) ((_p) && (*((uint32_t *)(_p)) ==
(uint32_t)(RT_BREP_INTERNAL_MAGIC)))
+
/*
- * ID_NMG
- *
* The internal form of the NMG is not rt_nmg_internal, but just a
* "struct model", from nmg.h. e.g.:
*
- * if ( intern.idb_type == ID_NMG )
- * m = (struct model *)intern.idb_ptr;
+ * if (intern.idb_type == ID_NMG)
+ * m = (struct model *)intern.idb_ptr;
*/
/*
- * ID_EBM
+ * ID_EBM
*/
#define RT_EBM_NAME_LEN 256
-struct rt_ebm_internal {
+struct rt_ebm_internal {
uint32_t magic;
- char file[RT_EBM_NAME_LEN];
+ char file[RT_EBM_NAME_LEN];
/* NOTE: xdim/ydim cannot be size_t until rel8 as they are
* written out to disk via bu_vls_struct_print() as 32-bit ints.
*/
- uint32_t xdim; /**< @brief X dimension (w cells) */
- uint32_t ydim; /**< @brief Y dimension (n cells) */
- fastf_t tallness; /**< @brief Z dimension (mm) */
- mat_t mat; /**< @brief convert local coords to
model space */
+ uint32_t xdim; /**< @brief X dimension (w cells) */
+ uint32_t ydim; /**< @brief Y dimension (n cells) */
+ fastf_t tallness; /**< @brief Z dimension (mm) */
+ mat_t mat; /**< @brief convert local coords to model space */
/* REMAINING ELEMENTS PROVIDED BY IMPORT, UNUSED BY EXPORT */
- struct bu_mapped_file *mp; /**< @brief actual data */
+ struct bu_mapped_file *mp; /**< @brief actual data */
};
-#define RT_EBM_CK_MAGIC(_p) BU_CKMAG(_p, RT_EBM_INTERNAL_MAGIC,
"rt_ebm_internal")
+#define RT_EBM_CK_MAGIC(_p) BU_CKMAG(_p, RT_EBM_INTERNAL_MAGIC,
"rt_ebm_internal")
/*
- * ID_VOL
+ * ID_VOL
*/
#define RT_VOL_NAME_LEN 128
-struct rt_vol_internal {
+struct rt_vol_internal {
uint32_t magic;
- char file[RT_VOL_NAME_LEN];
+ char file[RT_VOL_NAME_LEN];
/* NOTE: [xyz]dim/lo/hi cannot be size_t until rel8 as they are
* written out to disk via bu_vls_struct_print() as 32-bit ints.
*/
- uint32_t xdim; /**< @brief X dimension */
- uint32_t ydim; /**< @brief Y dimension */
- uint32_t zdim; /**< @brief Z dimension */
- uint32_t lo; /**< @brief Low threshold */
- uint32_t hi; /**< @brief High threshold */
- vect_t cellsize; /**< @brief ideal coords: size of each
cell */
- mat_t mat; /**< @brief convert local coords to
model space */
+ uint32_t xdim; /**< @brief X dimension */
+ uint32_t ydim; /**< @brief Y dimension */
+ uint32_t zdim; /**< @brief Z dimension */
+ uint32_t lo; /**< @brief Low threshold */
+ uint32_t hi; /**< @brief High threshold */
+ vect_t cellsize; /**< @brief ideal coords: size of each cell */
+ mat_t mat; /**< @brief convert local coords to model space */
/* REMAINING ELEMENTS PROVIDED BY IMPORT, UNUSED BY EXPORT */
- unsigned char *map;
+ unsigned char *map;
};
-#define RT_VOL_CK_MAGIC(_p) BU_CKMAG(_p, RT_VOL_INTERNAL_MAGIC,
"rt_vol_internal")
+#define RT_VOL_CK_MAGIC(_p) BU_CKMAG(_p, RT_VOL_INTERNAL_MAGIC,
"rt_vol_internal")
/*
- * ID_HF
+ * ID_HF
*/
struct rt_hf_internal {
uint32_t magic;
/* BEGIN USER SETTABLE VARIABLES */
- char cfile[128]; /**< @brief name of control file
(optional) */
- char dfile[128]; /**< @brief name of data file */
- char fmt[8]; /**< @brief CV style file format
descriptor */
+ char cfile[128]; /**< @brief name of control file (optional) */
+ char dfile[128]; /**< @brief name of data file */
+ char fmt[8]; /**< @brief CV style file format descriptor */
/* NOTE: w/n/shorts cannot be size_t until rel8 as they are
* written out to disk via bu_vls_struct_print() as 32-bit ints.
*/
- uint32_t w; /**< @brief # samples wide of data
file. ("i", "x") */
- uint32_t n; /**< @brief nlines of data file.
("j", "y") */
- uint32_t shorts; /**< @brief !0 --> memory array is
short, not float */
- fastf_t file2mm; /**< @brief scale factor to cvt file
units to mm */
- vect_t v; /**< @brief origin of HT in model
space */
- vect_t x; /**< @brief model vect corresponding
to "w" dir (will be unitized) */
- vect_t y; /**< @brief model vect corresponding
to "n" dir (will be unitized) */
- fastf_t xlen; /**< @brief model len of HT rpp in "w"
dir */
- fastf_t ylen; /**< @brief model len of HT rpp in "n"
dir */
- fastf_t zscale; /**< @brief scale of data in ''up''
dir (after file2mm is applied) */
+ uint32_t w; /**< @brief # samples wide of data file. ("i",
"x") */
+ uint32_t n; /**< @brief nlines of data file. ("j", "y") */
+ uint32_t shorts; /**< @brief !0 --> memory array is short, not float */
+ fastf_t file2mm; /**< @brief scale factor to cvt file units to mm */
+ vect_t v; /**< @brief origin of HT in model space */
+ vect_t x; /**< @brief model vect corresponding to "w" dir (will
be unitized) */
+ vect_t y; /**< @brief model vect corresponding to "n" dir (will
be unitized) */
+ fastf_t xlen; /**< @brief model len of HT rpp in "w" dir */
+ fastf_t ylen; /**< @brief model len of HT rpp in "n" dir */
+ fastf_t zscale; /**< @brief scale of data in ''up'' dir (after file2mm
is applied) */
/* END USER SETTABLE VARIABLES, BEGIN INTERNAL STUFF */
- struct bu_mapped_file *mp; /**< @brief actual data */
+ struct bu_mapped_file *mp; /**< @brief actual data */
};
-#define RT_HF_CK_MAGIC(_p) BU_CKMAG(_p, RT_HF_INTERNAL_MAGIC,
"rt_hf_internal")
+#define RT_HF_CK_MAGIC(_p) BU_CKMAG(_p, RT_HF_INTERNAL_MAGIC, "rt_hf_internal")
/*
- * ID_ARBN
+ * ID_ARBN
*/
-struct rt_arbn_internal {
+struct rt_arbn_internal {
uint32_t magic;
- size_t neqn;
- plane_t *eqn;
+ size_t neqn;
+ plane_t *eqn;
};
-#define RT_ARBN_CK_MAGIC(_p) BU_CKMAG(_p, RT_ARBN_INTERNAL_MAGIC,
"rt_arbn_internal")
+#define RT_ARBN_CK_MAGIC(_p) BU_CKMAG(_p, RT_ARBN_INTERNAL_MAGIC,
"rt_arbn_internal")
/*
- * ID_PIPE
+ * ID_PIPE
*/
struct rt_pipe_internal {
uint32_t pipe_magic;
@@ -329,142 +329,142 @@
/* REMAINING ELEMENTS PROVIDED BY IMPORT, UNUSED BY EXPORT */
int pipe_count;
};
-#define RT_PIPE_CK_MAGIC(_p) BU_CKMAG(_p, RT_PIPE_INTERNAL_MAGIC,
"rt_pipe_internal")
+#define RT_PIPE_CK_MAGIC(_p) BU_CKMAG(_p, RT_PIPE_INTERNAL_MAGIC,
"rt_pipe_internal")
/*
- * ID_PARTICLE
+ * ID_PARTICLE
*/
struct rt_part_internal {
uint32_t part_magic;
- point_t part_V;
- vect_t part_H;
- fastf_t part_vrad;
- fastf_t part_hrad;
+ point_t part_V;
+ vect_t part_H;
+ fastf_t part_vrad;
+ fastf_t part_hrad;
/* REMAINING ELEMENTS PROVIDED BY IMPORT, UNUSED BY EXPORT */
- int part_type; /**< @brief sphere, cylinder, cone */
+ int part_type; /**< @brief sphere, cylinder, cone */
};
-#define RT_PART_CK_MAGIC(_p) BU_CKMAG(_p, RT_PART_INTERNAL_MAGIC,
"rt_part_internal")
+#define RT_PART_CK_MAGIC(_p) BU_CKMAG(_p, RT_PART_INTERNAL_MAGIC,
"rt_part_internal")
-#define RT_PARTICLE_TYPE_SPHERE 1
-#define RT_PARTICLE_TYPE_CYLINDER 2
-#define RT_PARTICLE_TYPE_CONE 3
+#define RT_PARTICLE_TYPE_SPHERE 1
+#define RT_PARTICLE_TYPE_CYLINDER 2
+#define RT_PARTICLE_TYPE_CONE 3
/*
- * ID_RPC
+ * ID_RPC
*/
struct rt_rpc_internal {
uint32_t rpc_magic;
- point_t rpc_V; /**< @brief rpc vertex */
- vect_t rpc_H; /**< @brief height vector */
- vect_t rpc_B; /**< @brief breadth vector */
- fastf_t rpc_r; /**< @brief scalar half-width of rectangular face */
+ point_t rpc_V; /**< @brief rpc vertex */
+ vect_t rpc_H; /**< @brief height vector */
+ vect_t rpc_B; /**< @brief breadth vector */
+ fastf_t rpc_r; /**< @brief scalar half-width of rectangular face */
};
-#define RT_RPC_CK_MAGIC(_p) BU_CKMAG(_p, RT_RPC_INTERNAL_MAGIC,
"rt_rpc_internal")
+#define RT_RPC_CK_MAGIC(_p) BU_CKMAG(_p, RT_RPC_INTERNAL_MAGIC,
"rt_rpc_internal")
/*
- * ID_RHC
+ * ID_RHC
*/
struct rt_rhc_internal {
uint32_t rhc_magic;
- point_t rhc_V; /**< @brief rhc vertex */
- vect_t rhc_H; /**< @brief height vector */
- vect_t rhc_B; /**< @brief breadth vector */
- fastf_t rhc_r; /**< @brief scalar half-width of rectangular face */
- fastf_t rhc_c; /**< @brief dist from hyperbola to vertex of
asymptotes */
+ point_t rhc_V; /**< @brief rhc vertex */
+ vect_t rhc_H; /**< @brief height vector */
+ vect_t rhc_B; /**< @brief breadth vector */
+ fastf_t rhc_r; /**< @brief scalar half-width of rectangular face */
+ fastf_t rhc_c; /**< @brief dist from hyperbola to vertex of asymptotes
*/
};
-#define RT_RHC_CK_MAGIC(_p) BU_CKMAG(_p, RT_RHC_INTERNAL_MAGIC,
"rt_rhc_internal")
+#define RT_RHC_CK_MAGIC(_p) BU_CKMAG(_p, RT_RHC_INTERNAL_MAGIC,
"rt_rhc_internal")
/*
- * ID_EPA
+ * ID_EPA
*/
struct rt_epa_internal {
uint32_t epa_magic;
- point_t epa_V; /**< @brief epa vertex */
- vect_t epa_H; /**< @brief height vector */
- vect_t epa_Au; /**< @brief unit vector along semi-major axis */
- fastf_t epa_r1; /**< @brief scalar semi-major axis length */
- fastf_t epa_r2; /**< @brief scalar semi-minor axis length */
+ point_t epa_V; /**< @brief epa vertex */
+ vect_t epa_H; /**< @brief height vector */
+ vect_t epa_Au; /**< @brief unit vector along semi-major axis */
+ fastf_t epa_r1; /**< @brief scalar semi-major axis length */
+ fastf_t epa_r2; /**< @brief scalar semi-minor axis length */
};
-#define RT_EPA_CK_MAGIC(_p) BU_CKMAG(_p, RT_EPA_INTERNAL_MAGIC,
"rt_epa_internal")
+#define RT_EPA_CK_MAGIC(_p) BU_CKMAG(_p, RT_EPA_INTERNAL_MAGIC,
"rt_epa_internal")
/*
- * ID_EHY
+ * ID_EHY
*/
struct rt_ehy_internal {
uint32_t ehy_magic;
- point_t ehy_V; /**< @brief ehy vertex */
- vect_t ehy_H; /**< @brief height vector */
- vect_t ehy_Au; /**< @brief unit vector along semi-major axis */
- fastf_t ehy_r1; /**< @brief scalar semi-major axis length */
- fastf_t ehy_r2; /**< @brief scalar semi-minor axis length */
- fastf_t ehy_c; /**< @brief dist from hyperbola to vertex of
asymptotes */
+ point_t ehy_V; /**< @brief ehy vertex */
+ vect_t ehy_H; /**< @brief height vector */
+ vect_t ehy_Au; /**< @brief unit vector along semi-major axis */
+ fastf_t ehy_r1; /**< @brief scalar semi-major axis length */
+ fastf_t ehy_r2; /**< @brief scalar semi-minor axis length */
+ fastf_t ehy_c; /**< @brief dist from hyperbola to vertex of asymptotes
*/
};
-#define RT_EHY_CK_MAGIC(_p) BU_CKMAG(_p, RT_EHY_INTERNAL_MAGIC,
"rt_ehy_internal")
+#define RT_EHY_CK_MAGIC(_p) BU_CKMAG(_p, RT_EHY_INTERNAL_MAGIC,
"rt_ehy_internal")
/*
- * ID_HYP
+ * ID_HYP
*/
struct rt_hyp_internal {
uint32_t hyp_magic;
- point_t hyp_Vi; /**< @brief hyp vertex */
- vect_t hyp_Hi; /**< @brief full height vector */
- vect_t hyp_A; /**< @brief semi-major axis */
- fastf_t hyp_b; /**< @brief scalar semi-minor axis length */
- fastf_t hyp_bnr;/**< @brief ratio of minimum neck width to base width
*/
+ point_t hyp_Vi; /**< @brief hyp vertex */
+ vect_t hyp_Hi; /**< @brief full height vector */
+ vect_t hyp_A; /**< @brief semi-major axis */
+ fastf_t hyp_b; /**< @brief scalar semi-minor axis length */
+ fastf_t hyp_bnr;/**< @brief ratio of minimum neck width to base width */
};
-#define RT_HYP_CK_MAGIC(_p) BU_CKMAG(_p, RT_HYP_INTERNAL_MAGIC,
"rt_hyp_internal")
+#define RT_HYP_CK_MAGIC(_p) BU_CKMAG(_p, RT_HYP_INTERNAL_MAGIC,
"rt_hyp_internal")
/*
- * ID_ETO
+ * ID_ETO
*/
struct rt_eto_internal {
uint32_t eto_magic;
- point_t eto_V; /**< @brief eto vertex */
- vect_t eto_N; /**< @brief vector normal to plane of torus */
- vect_t eto_C; /**< @brief vector along semi-major axis of ellipse */
- fastf_t eto_r; /**< @brief scalar radius of rotation */
- fastf_t eto_rd; /**< @brief scalar length of semi-minor of ellipse */
+ point_t eto_V; /**< @brief eto vertex */
+ vect_t eto_N; /**< @brief vector normal to plane of torus */
+ vect_t eto_C; /**< @brief vector along semi-major axis of ellipse */
+ fastf_t eto_r; /**< @brief scalar radius of rotation */
+ fastf_t eto_rd; /**< @brief scalar length of semi-minor of ellipse */
};
-#define RT_ETO_CK_MAGIC(_p) BU_CKMAG(_p, RT_ETO_INTERNAL_MAGIC,
"rt_eto_internal")
+#define RT_ETO_CK_MAGIC(_p) BU_CKMAG(_p, RT_ETO_INTERNAL_MAGIC,
"rt_eto_internal")
/*
- * ID_DSP
+ * ID_DSP
*/
#define DSP_NAME_LEN 128
struct rt_dsp_internal{
uint32_t magic;
-#define dsp_file dsp_name /**< @brief for backwards compatibility
*/
+#define dsp_file dsp_name /**< @brief for backwards compatibility */
struct bu_vls dsp_name; /**< TODO: make this a pointer, name of data
file */
/* NOTE: dsp_xcnt/dsp_ycnt cannot be size_t until rel8 as they are
* written out to disk via bu_vls_struct_print() as 32-bit ints.
*/
- uint32_t dsp_xcnt; /**< @brief # samples in row of data */
- uint32_t dsp_ycnt; /**< @brief # of columns in data */
- unsigned short dsp_smooth; /**< @brief bool: surf normal interp */
-#define DSP_CUT_DIR_ADAPT 'a'
-#define DSP_CUT_DIR_llUR 'l'
-#define DSP_CUT_DIR_ULlr 'L'
- unsigned char dsp_cuttype; /**< @brief type of cut to make */
+ uint32_t dsp_xcnt; /**< @brief # samples in row of data */
+ uint32_t dsp_ycnt; /**< @brief # of columns in data */
+ unsigned short dsp_smooth; /**< @brief bool: surf normal interp */
+#define DSP_CUT_DIR_ADAPT 'a'
+#define DSP_CUT_DIR_llUR 'l'
+#define DSP_CUT_DIR_ULlr 'L'
+ unsigned char dsp_cuttype; /**< @brief type of cut to make */
- mat_t dsp_mtos; /**< @brief model to solid space */
+ mat_t dsp_mtos; /**< @brief model to solid space */
/* END OF USER SETTABLE VARIABLES, BEGIN INTERNAL STUFF */
- mat_t dsp_stom; /**< @brief solid to model space
- * computed from dsp_mtos */
- unsigned short *dsp_buf; /**< @brief actual data */
- struct bu_mapped_file *dsp_mp; /**< @brief mapped file for data */
- struct rt_db_internal *dsp_bip; /**< @brief db object for data */
-#define RT_DSP_SRC_V4_FILE '4'
-#define RT_DSP_SRC_FILE 'f'
-#define RT_DSP_SRC_OBJ 'o'
- char dsp_datasrc; /**< @brief which type of data source */
+ mat_t dsp_stom; /**< @brief solid to model space
+ * computed from dsp_mtos */
+ unsigned short *dsp_buf; /**< @brief actual data */
+ struct bu_mapped_file *dsp_mp; /**< @brief mapped file for data */
+ struct rt_db_internal *dsp_bip; /**< @brief db object for data */
+#define RT_DSP_SRC_V4_FILE '4'
+#define RT_DSP_SRC_FILE 'f'
+#define RT_DSP_SRC_OBJ 'o'
+ char dsp_datasrc; /**< @brief which type of data source */
};
-#define RT_DSP_CK_MAGIC(_p) BU_CKMAG(_p, RT_DSP_INTERNAL_MAGIC,
"rt_dsp_internal")
+#define RT_DSP_CK_MAGIC(_p) BU_CKMAG(_p, RT_DSP_INTERNAL_MAGIC,
"rt_dsp_internal")
/*
- * ID_SKETCH
+ * ID_SKETCH
*/
/**
@@ -484,45 +484,48 @@
*
* used by the sketch and solid of extrusion
*/
-struct line_seg /**< @brief line segment */
+struct line_seg /**< @brief line segment */
{
uint32_t magic;
- int start, end; /**< @brief indices into
sketch's array of vertices */
+ int start, end; /**< @brief indices into sketch's array of vertices */
};
-struct carc_seg /**< @brief circular arc segment */
+
+struct carc_seg /**< @brief circular arc segment */
{
uint32_t magic;
- int start, end; /**< @brief indices */
- fastf_t radius; /**< @brief radius < 0.0 -> full
circle with start point on
- * circle and "end" at center */
- int center_is_left; /**< @brief flag indicating
where center of curvature is.
- * If non-zero, then center is to left
of vector
- * from start to end */
- int orientation; /**< @brief 0 -> ccw, !0 -> cw
*/
- int center; /**< @brief index of vertex at
center of arc (only used by rt_extrude_prep and rt_extrude_shot) */
+ int start, end; /**< @brief indices */
+ fastf_t radius; /**< @brief radius < 0.0 -> full circle with start
point on
+ * circle and "end" at center */
+ int center_is_left; /**< @brief flag indicating where center of
curvature is.
+ * If non-zero, then center is to left of vector
+ * from start to end */
+ int orientation; /**< @brief 0 -> ccw, !0 -> cw */
+ int center; /**< @brief index of vertex at center of arc
(only used by rt_extrude_prep and rt_extrude_shot) */
};
-struct nurb_seg /**< @brief NURB curve segment */
+
+struct nurb_seg /**< @brief NURB curve segment */
{
uint32_t magic;
- int order; /**< @brief order of NURB
curve (degree - 1) */
- int pt_type; /**< @brief type of NURB curve
*/
- struct knot_vector k; /**< @brief knot vector for NURB curve
*/
- int c_size; /**< @brief number of control
points */
- int *ctl_points; /**< @brief array of indices
for control points */
- fastf_t *weights; /**< @brief array of weights for
control points (NULL if non_rational) */
+ int order; /**< @brief order of NURB curve (degree - 1) */
+ int pt_type; /**< @brief type of NURB curve */
+ struct knot_vector k; /**< @brief knot vector for NURB curve */
+ int c_size; /**< @brief number of control points */
+ int *ctl_points; /**< @brief array of indices for control points */
+ fastf_t *weights; /**< @brief array of weights for control points (NULL
if non_rational) */
};
-struct bezier_seg /**< @brief Bezier curve segment */
+
+struct bezier_seg /**< @brief Bezier curve segment */
{
uint32_t magic;
- int degree; /**< @brief degree of curve
(number of control points - 1) */
- int *ctl_points; /**< @brief array of indices
for control points */
+ int degree; /**< @brief degree of curve (number of control
points - 1) */
+ int *ctl_points; /**< @brief array of indices for control points */
};
-#define SKETCH_NAME_LEN 16
+#define SKETCH_NAME_LEN 16
struct rt_sketch_internal
{
uint32_t magic;
@@ -540,81 +543,82 @@
*/
struct rt_curve curve; /**< the curves of this sketch */
};
-#define RT_SKETCH_CK_MAGIC(_p) BU_CKMAG(_p, RT_SKETCH_INTERNAL_MAGIC,
"rt_sketch_internal")
+#define RT_SKETCH_CK_MAGIC(_p) BU_CKMAG(_p, RT_SKETCH_INTERNAL_MAGIC,
"rt_sketch_internal")
/*
- * ID_SUBMODEL
+ * ID_SUBMODEL
*/
struct rt_submodel_internal {
uint32_t magic;
struct bu_vls file; /**< @brief .g filename, 0-len -->
this database. */
- struct bu_vls treetop; /**< @brief one treetop only */
- int meth; /**< @brief space partitioning method */
+ struct bu_vls treetop; /**< @brief one treetop only */
+ int meth; /**< @brief space partitioning method */
/* other option flags (lazy prep, etc.)?? */
/* REMAINING ELEMENTS PROVIDED BY IMPORT, UNUSED BY EXPORT */
mat_t root2leaf;
const struct db_i *dbip;
};
-#define RT_SUBMODEL_CK_MAGIC(_p) BU_CKMAG(_p,
RT_SUBMODEL_INTERNAL_MAGIC, "rt_submodel_internal")
+#define RT_SUBMODEL_CK_MAGIC(_p) BU_CKMAG(_p, RT_SUBMODEL_INTERNAL_MAGIC,
"rt_submodel_internal")
/*
- * ID_EXTRUDE
+ * ID_EXTRUDE
*/
struct rt_extrude_internal
{
uint32_t magic;
- point_t V; /**< @brief vertex, start and end
point of loop to be extruded */
- vect_t h; /**< @brief extrusion vector, may not
be in (u_vec X v_vec) plane */
- vect_t u_vec; /**< @brief vector in U parameter
direction */
- vect_t v_vec; /**< @brief vector in V parameter
direction */
- int keypoint; /**< @brief DEPRECATED
(UNUSED): index of keypoint vertex */
- char *sketch_name; /**< @brief name of sketch object that
defines the curve to be extruded */
- struct rt_sketch_internal *skt; /**< @brief pointer to referenced
sketch */
+ point_t V; /**< @brief vertex, start and end point of loop to be
extruded */
+ vect_t h; /**< @brief extrusion vector, may not be in (u_vec X
v_vec) plane */
+ vect_t u_vec; /**< @brief vector in U parameter direction */
+ vect_t v_vec; /**< @brief vector in V parameter direction */
+ int keypoint; /**< @brief DEPRECATED (UNUSED): index of keypoint
vertex */
+ char *sketch_name; /**< @brief name of sketch object that defines the
curve to be extruded */
+ struct rt_sketch_internal *skt; /**< @brief pointer to referenced
sketch */
};
+
/**
* Note that the u_vec and v_vec are not unit vectors, their magnitude
* and direction are used for scaling and rotation.
*/
-#define RT_EXTRUDE_CK_MAGIC(_p) BU_CKMAG(_p, RT_EXTRUDE_INTERNAL_MAGIC,
"rt_extrude_internal")
+#define RT_EXTRUDE_CK_MAGIC(_p) BU_CKMAG(_p, RT_EXTRUDE_INTERNAL_MAGIC,
"rt_extrude_internal")
/*
- * ID_REVOLVE
+ * ID_REVOLVE
*/
struct rt_revolve_internal {
uint32_t magic;
- point_t v3d; /**< @brief vertex in 3d space */
- vect_t axis3d; /**< @brief revolve axis in 3d space, y
axis */
+ point_t v3d; /**< @brief vertex in 3d space */
+ vect_t axis3d; /**< @brief revolve axis in 3d space, y axis */
- point2d_t v2d; /**< @brief vertex in 2d sketch */
- vect2d_t axis2d; /**< @brief revolve axis in 2d sketch */
+ point2d_t v2d; /**< @brief vertex in 2d sketch */
+ vect2d_t axis2d; /**< @brief revolve axis in 2d sketch */
- vect_t r; /**< @brief vector in start plane, x
axis */
- fastf_t ang; /**< @brief angle to revolve*/
- struct bu_vls sketch_name; /**< @brief name of sketch */
+ vect_t r; /**< @brief vector in start plane, x axis */
+ fastf_t ang; /**< @brief angle to revolve*/
+ struct bu_vls sketch_name; /**< @brief name of sketch */
struct rt_sketch_internal *skt; /**< @brief pointer to sketch */
};
-#define RT_REVOLVE_CK_MAGIC(_p) BU_CKMAG(_p, RT_REVOLVE_INTERNAL_MAGIC,
"rt_revolve_internal")
+#define RT_REVOLVE_CK_MAGIC(_p) BU_CKMAG(_p, RT_REVOLVE_INTERNAL_MAGIC,
"rt_revolve_internal")
/*
- * ID_CLINE
+ * ID_CLINE
*
- * Implementation of FASTGEN CLINE element
+ * Implementation of FASTGEN CLINE element
*/
struct rt_cline_internal
{
uint32_t magic;
- point_t v;
- vect_t h;
- fastf_t radius;
- fastf_t thickness; /**< @brief zero thickness means
volume mode */
+ point_t v;
+ vect_t h;
+ fastf_t radius;
+ fastf_t thickness; /**< @brief zero thickness means volume mode */
};
-#define RT_CLINE_CK_MAGIC(_p) BU_CKMAG(_p, RT_CLINE_INTERNAL_MAGIC,
"rt_cline_internal")
+#define RT_CLINE_CK_MAGIC(_p) BU_CKMAG(_p, RT_CLINE_INTERNAL_MAGIC,
"rt_cline_internal")
/*
- * ID_BOT
+ * ID_BOT
*/
struct rt_bot_internal
@@ -661,39 +665,41 @@
void *tie; /* FIXME: blind casting. TIE needs to move from TIE_FUNC to
XGLUE before this can not suck. */
};
+
struct rt_bot_list {
struct bu_list l;
struct rt_bot_internal *bot;
};
+
/* orientations for BOT */
-#define RT_BOT_UNORIENTED 1 /**< @brief unoriented
triangles */
-#define RT_BOT_CCW 2 /**< @brief oriented
counter-clockwise */
-#define RT_BOT_CW 3 /**< @brief oriented clockwise
*/
+#define RT_BOT_UNORIENTED 1 /**< @brief unoriented triangles */
+#define RT_BOT_CCW 2 /**< @brief oriented counter-clockwise */
+#define RT_BOT_CW 3 /**< @brief oriented clockwise */
/* modes for BOT */
-#define RT_BOT_SURFACE 1 /**< @brief triangles
represent a surface (no volume) */
-#define RT_BOT_SOLID 2 /**< @brief triangles
represent the boundary of a solid object */
+#define RT_BOT_SURFACE 1 /**< @brief triangles represent a surface (no
volume) */
+#define RT_BOT_SOLID 2 /**< @brief triangles represent the
boundary of a solid object */
/**
* triangles represent plates. Thicknesses are specified in
* "thickness" array, and face mode is specified in "face_mode" bit
* vector. This is the FASTGEN "plate" mode. Orientation is ignored.
*/
-#define RT_BOT_PLATE 3
+#define RT_BOT_PLATE 3
/**
* same as plate mode, but LOS is set equal to face thickness, not the
* thickness divided by the cosine of the obliquity angle.
*/
-#define RT_BOT_PLATE_NOCOS 4
+#define RT_BOT_PLATE_NOCOS 4
/* flags for bot_flags */
-#define RT_BOT_HAS_SURFACE_NORMALS 0x1 /**< @brief This primitive
may have surface normals at each face vertex */
-#define RT_BOT_USE_NORMALS 0x2 /**< @brief Use the surface
normals if they exist */
-#define RT_BOT_USE_FLOATS 0x4 /**< @brief Use the single
precision version of "tri_specific" during prep */
+#define RT_BOT_HAS_SURFACE_NORMALS 0x1 /**< @brief This primitive may have
surface normals at each face vertex */
+#define RT_BOT_USE_NORMALS 0x2 /**< @brief Use the surface normals if
they exist */
+#define RT_BOT_USE_FLOATS 0x4 /**< @brief Use the single precision
version of "tri_specific" during prep */
-#define RT_BOT_CK_MAGIC(_p) BU_CKMAG(_p, RT_BOT_INTERNAL_MAGIC,
"rt_bot_internal")
+#define RT_BOT_CK_MAGIC(_p) BU_CKMAG(_p, RT_BOT_INTERNAL_MAGIC,
"rt_bot_internal")
/**
@@ -777,10 +783,10 @@
unsigned long count;
void *point;
};
-#define RT_PNTS_CK_MAGIC(_p) BU_CKMAG(_p, RT_PNTS_INTERNAL_MAGIC,
"rt_pnts_internal")
+#define RT_PNTS_CK_MAGIC(_p) BU_CKMAG(_p, RT_PNTS_INTERNAL_MAGIC,
"rt_pnts_internal")
/*
- * ID_ANNOTATION
+ * ID_ANNOTATION
*
* Annotations are used to provide labels in-scene when viewing geometry.
Leaders connect labels
* to geometry objects or fixed points in space.
@@ -790,33 +796,34 @@
struct rt_annotation_internal
{
uint32_t magic;
- point_t V; /**< @brief vertex, start and
end point of loop to be extruded */
- vect_t h; /**< @brief extrusion vector,
may not be in (u_vec X v_vec) plane */
- vect_t u_vec; /**< @brief vector in U
parameter direction */
- vect_t v_vec; /**< @brief vector in V
parameter direction */
- int view_aligned;
- struct bu_vls label; /**< @brief either user
supplied labels, format strings, or empty */
- struct rt_sketch_internal *skt; /**< @brief pointer to sketch
holding label decoration (if any) - same plane as text plane */
+ point_t V; /**< @brief vertex, start and end point
of loop to be extruded */
+ vect_t h; /**< @brief extrusion vector, may not
be in (u_vec X v_vec) plane */
+ vect_t u_vec; /**< @brief vector in U parameter
direction */
+ vect_t v_vec; /**< @brief vector in V parameter
direction */
+ int view_aligned;
+ struct bu_vls label; /**< @brief either user supplied
labels, format strings, or empty */
+ struct rt_sketch_internal *skt; /**< @brief pointer to sketch holding
label decoration (if any) - same plane as text plane */
};
+
/**
* Note that the u_vec and v_vec are not unit vectors, their magnitude
* and direction are used for scaling and rotation.
*/
-#define RT_ANNOTATION_CK_MAGIC(_p) BU_CKMAG(_p,
RT_ANNOTATION_INTERNAL_MAGIC, "rt_annotation_internal")
+#define RT_ANNOTATION_CK_MAGIC(_p) BU_CKMAG(_p, RT_ANNOTATION_INTERNAL_MAGIC,
"rt_annotation_internal")
struct rt_hrt_internal
{
uint32_t hrt_magic;
- point_t v; /**< @brief center point */
- vect_t a; /**< @brief axis a radial length */
- vect_t b; /**< @brief axis b radial length */
- vect_t c; /**< @brief axis c radial length */
- fastf_t nscurv; /**< @brief north-south curvature */
- fastf_t ewcurv; /**< @brief east-west curvature */
+ point_t v; /**< @brief center point */
+ vect_t a; /**< @brief axis a radial length */
+ vect_t b; /**< @brief axis b radial length */
+ vect_t c; /**< @brief axis c radial length */
+ fastf_t nscurv; /**< @brief north-south curvature */
+ fastf_t ewcurv; /**< @brief east-west curvature */
};
-#define RT_HRT_CK_MAGIC(_p) BU_CKMAG(_p, RT_HRT_INTERNAL_MAGIC,
"rt_hrt_internal")
+#define RT_HRT_CK_MAGIC(_p) BU_CKMAG(_p, RT_HRT_INTERNAL_MAGIC,
"rt_hrt_internal")
__END_DECLS
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
