Revision: 69071
http://sourceforge.net/p/brlcad/code/69071
Author: starseeker
Date: 2016-10-15 19:38:17 +0000 (Sat, 15 Oct 2016)
Log Message:
-----------
push out the rest of the rt/nmg.h includes, except for the problematic
nmg_class.c
Modified Paths:
--------------
brlcad/trunk/include/nmg.h
brlcad/trunk/include/rt/nmg.h
brlcad/trunk/include/rt/nurb.h
brlcad/trunk/src/librt/primitives/nmg/nmg_copy.c
brlcad/trunk/src/librt/primitives/nmg/nmg_eval.c
brlcad/trunk/src/librt/primitives/nmg/nmg_extrude.c
brlcad/trunk/src/librt/primitives/nmg/nmg_fcut.c
brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
brlcad/trunk/src/librt/primitives/nmg/nmg_index.c
brlcad/trunk/src/librt/primitives/nmg/nmg_info.c
brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c
brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c
brlcad/trunk/src/librt/primitives/nmg/nmg_manif.c
brlcad/trunk/src/librt/primitives/nmg/nmg_mesh.c
brlcad/trunk/src/librt/primitives/nmg/nmg_mirror.c
brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c
brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c
brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c
brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c
brlcad/trunk/src/librt/primitives/nmg/nmg_pr.c
brlcad/trunk/src/librt/primitives/nmg/nmg_pt_fu.c
brlcad/trunk/src/librt/primitives/nmg/nmg_tri.c
brlcad/trunk/src/librt/primitives/nmg/nmg_visit.c
Modified: brlcad/trunk/include/nmg.h
===================================================================
--- brlcad/trunk/include/nmg.h 2016-10-15 15:42:28 UTC (rev 69070)
+++ brlcad/trunk/include/nmg.h 2016-10-15 19:38:17 UTC (rev 69071)
@@ -825,8 +825,19 @@
};
#define NMG_CK_INTER_STRUCT(_p) NMG_CKMAG(_p, NMG_INTER_STRUCT_MAGIC,
"nmg_inter_struct")
+/**
+ * global nmg animation vblock callback
+ */
+RT_EXPORT extern void (*nmg_vlblock_anim_upcall)(void);
+/**
+ * global nmg mged display debug callback (ew)
+ */
+RT_EXPORT extern void (*nmg_mged_debug_display_hack)(void);
+
+
+
/* From file nmg_mk.c */
/* MAKE routines */
RT_EXPORT extern struct model *nmg_mm(void);
Modified: brlcad/trunk/include/rt/nmg.h
===================================================================
--- brlcad/trunk/include/rt/nmg.h 2016-10-15 15:42:28 UTC (rev 69070)
+++ brlcad/trunk/include/rt/nmg.h 2016-10-15 19:38:17 UTC (rev 69071)
@@ -247,17 +247,7 @@
*/
RT_EXPORT extern void (*nmg_plot_anim_upcall)(void);
-/**
- * global nmg animation vblock callback
- */
-RT_EXPORT extern void (*nmg_vlblock_anim_upcall)(void);
-/**
- * global nmg mged display debug callback
- */
-RT_EXPORT extern void (*nmg_mged_debug_display_hack)(void);
-
-
/* From nmg_rt_isect.c */
RT_EXPORT extern void nmg_rt_print_hitlist(struct bu_list *hd);
Modified: brlcad/trunk/include/rt/nurb.h
===================================================================
--- brlcad/trunk/include/rt/nurb.h 2016-10-15 15:42:28 UTC (rev 69070)
+++ brlcad/trunk/include/rt/nurb.h 2016-10-15 19:38:17 UTC (rev 69071)
@@ -37,6 +37,7 @@
#include "bu/list.h"
#include "bn/plane.h"
#include "rt/defines.h"
+#include "rt/hit.h"
struct resource; /* forward declaration */
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_copy.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_copy.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_copy.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -31,8 +31,8 @@
#include <string.h>
+#include "bu/malloc.h"
#include "nmg.h"
-#include "rt/nmg.h"
#include "rt/nurb.h"
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_eval.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_eval.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_eval.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -34,8 +34,10 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/exit.h"
+#include "bu/list.h"
+#include "bu/log.h"
#include "nmg.h"
-#include "rt/nmg.h"
struct nmg_bool_state {
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_extrude.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_extrude.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_extrude.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -36,9 +36,7 @@
#include "bu/malloc.h"
#include "bn/plane.h"
#include "nmg.h"
-#include "rt/nmg.h"
-
/**
* Count number of vertices in an NMG loop.
*/
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_fcut.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_fcut.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_fcut.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -47,13 +47,12 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
#include "bu/sort.h"
#include "bn/plane.h"
#include "bn/plot3.h"
#include "nmg.h"
-#include "rt/nmg.h"
-
#define PLOT_BOTH_FACES 1
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -36,11 +36,11 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
#include "bu/sort.h"
#include "bu/str.h"
#include "bn/mat.h"
#include "nmg.h"
-#include "rt/nmg.h"
#include "rt/nurb.h"
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_index.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_index.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_index.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -34,8 +34,8 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
#include "nmg.h"
-#include "rt/nmg.h"
/**
* Return the structure index number of an arbitrary NMG structure.
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_info.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_info.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_info.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -38,10 +38,10 @@
#include "vmath.h"
#include "bu/debug.h"
+#include "bu/malloc.h"
#include "bn/mat.h"
#include "bn/plane.h"
#include "nmg.h"
-#include "rt/nmg.h"
/************************************************************************
* *
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -60,11 +60,11 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
#include "bn/mat.h"
#include "bn/plane.h"
#include "bn/plot3.h"
#include "nmg.h"
-#include "rt/nmg.h"
#define ISECT_NONE 0
#define ISECT_SHARED_V 1
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -44,7 +44,6 @@
#include "bn.h"
#include "vmath.h"
#include "nmg.h"
-#include "rt/nmg.h"
/**
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_manif.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_manif.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_manif.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -32,8 +32,8 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
#include "nmg.h"
-#include "rt/nmg.h"
#define PAINT_INTERIOR 1
#define PAINT_EXTERIOR 0
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_mesh.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_mesh.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_mesh.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -37,9 +37,7 @@
#include "vmath.h"
#include "bn/plane.h"
#include "nmg.h"
-#include "rt/nmg.h"
-
/**
* Determine if T lies within angle AB, such that A < T < B.
* The angle B is expected to be "more ccw" than A.
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_mirror.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_mirror.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_mirror.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -28,7 +28,6 @@
#include "raytrace.h"
#include "rt/geom.h"
-
/**
* Given a pointer to an internal GED database object, mirror the
* object's values about the given transformation matrix.
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -34,9 +34,9 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
+#include "bn/mat.h"
#include "nmg.h"
-#include "bn/mat.h"
-#include "rt/nmg.h"
#include "rt/nurb.h"
/* externed */
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -63,8 +63,8 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
#include "nmg.h"
-#include "rt/nmg.h"
#include "rt/nurb.h"
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -33,11 +33,10 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
#include "nmg.h"
-#include "rt/nmg.h"
#include "rt/nurb.h"
-
void
nmg_merge_regions(struct nmgregion *r1, struct nmgregion *r2, const struct
bn_tol *tol)
{
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -48,10 +48,10 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
#include "bn/plot3.h"
#include "bn/vlist.h"
#include "nmg.h"
-#include "rt/nmg.h"
#include "rt/nurb.h"
#define US_DELAY 10 /* Additional delay between frames */
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_pr.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_pr.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_pr.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -35,9 +35,9 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
+#include "bu/str.h"
#include "nmg.h"
-#include "bu/str.h"
-#include "rt/nmg.h"
#include "rt/nurb.h"
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_pt_fu.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_pt_fu.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_pt_fu.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -33,12 +33,11 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
#include "bn/plane.h"
#include "bn/plot3.h"
#include "nmg.h"
-#include "rt/nmg.h"
-
/* vertex/edge distance
* Each loop geometry element (edge/vertex) has one of these computed.
* We keep track of them for the whole face so that this value is computed
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_tri.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_tri.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_tri.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -33,12 +33,12 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/malloc.h"
+#include "bu/parallel.h"
#include "bn/mat.h"
-#include "bu/parallel.h"
#include "bn/plane.h"
#include "bn/plot3.h"
#include "nmg.h"
-#include "rt/nmg.h"
/* macros for comparing 2D points in scanline order */
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_visit.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_visit.c 2016-10-15 15:42:28 UTC
(rev 69070)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_visit.c 2016-10-15 19:38:17 UTC
(rev 69071)
@@ -42,9 +42,7 @@
#include "vmath.h"
#include "nmg.h"
-#include "rt/nmg.h"
-
void
nmg_visit_vertex(struct vertex *v, const struct nmg_visit_handlers *htab, void
*state)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
