Revision: 69032
http://sourceforge.net/p/brlcad/code/69032
Author: starseeker
Date: 2016-10-12 00:33:12 +0000 (Wed, 12 Oct 2016)
Log Message:
-----------
back out more headers - exposes some more work to do
Modified Paths:
--------------
brlcad/trunk/include/rt/global.h
brlcad/trunk/include/rt/nmg.h
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_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/rt/global.h
===================================================================
--- brlcad/trunk/include/rt/global.h 2016-10-12 00:09:06 UTC (rev 69031)
+++ brlcad/trunk/include/rt/global.h 2016-10-12 00:33:12 UTC (rev 69032)
@@ -44,9 +44,6 @@
};
#define RT_G_INIT_ZERO { 0, 0, BU_LIST_INIT_ZERO, RT_WDB_INIT_ZERO }
-
-RT_EXPORT extern uint32_t nmg_debug; /**< @brief debug bits for NMG's
see nmg.h */
-
/**
* global ray-trace geometry state
*/
Modified: brlcad/trunk/include/rt/nmg.h
===================================================================
--- brlcad/trunk/include/rt/nmg.h 2016-10-12 00:09:06 UTC (rev 69031)
+++ brlcad/trunk/include/rt/nmg.h 2016-10-12 00:33:12 UTC (rev 69032)
@@ -37,6 +37,8 @@
__BEGIN_DECLS
+RT_EXPORT extern uint32_t nmg_debug; /**< @brief debug bits for NMG's
see nmg.h */
+
/*********************************************************************************
* The following section is an exact copy of what was previously
"nmg_rt.h" *
* (with minor changes to NMG_GET_HITMISS and NMG_FREE_HITLIST
*
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_fcut.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_fcut.c 2016-10-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_fcut.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -48,9 +48,10 @@
#include "vmath.h"
#include "bu/sort.h"
+#include "bn/plane.h"
#include "bn/plot3.h"
#include "nmg.h"
-#include "raytrace.h"
+#include "rt/nmg.h"
#define PLOT_BOTH_FACES 1
@@ -3507,7 +3508,7 @@
(void *)vu, pos,
nmg_state_names[old_state],
nmg_v_assessment_names[assessment],
nmg_state_names[new_state], action_names[action]);
- if (RT_G_DEBUG || nmg_debug) {
+ if (nmg_debug) {
/* First, print this faceuse */
lu = nmg_find_lu_of_vu(vu);
NMG_CK_LOOPUSE(lu);
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2016-10-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -35,10 +35,12 @@
#include <math.h>
#include "bio.h"
+#include "vmath.h"
#include "bu/sort.h"
-#include "vmath.h"
+#include "bu/str.h"
+#include "bn/mat.h"
#include "nmg.h"
-#include "raytrace.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-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_index.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -35,7 +35,7 @@
#include "vmath.h"
#include "nmg.h"
-#include "raytrace.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-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_info.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -37,8 +37,11 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/debug.h"
+#include "bn/mat.h"
+#include "bn/plane.h"
#include "nmg.h"
-#include "raytrace.h"
+#include "rt/nmg.h"
/************************************************************************
* *
@@ -540,7 +543,7 @@
area = nmg_loop_plane_area2(lu, pl, tol);
if (NEAR_ZERO(area, tol->dist_sq)) {
- if (RT_G_DEBUG & DEBUG_MATH) {
+ if (nmg_debug & BU_DEBUG_MATH) {
bu_log("nmg_loop_is_ccw: Loop area (%g) is less than tol->dist_sq
(%g)\n", area, tol->dist_sq);
nmg_pr_lu_briefly(lu, " ");
}
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c 2016-10-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -60,9 +60,12 @@
#include "bio.h"
#include "vmath.h"
+#include "bn/mat.h"
+#include "bn/plane.h"
+#include "bn/plot3.h"
#include "nmg.h"
-#include "raytrace.h"
-#include "bn/plot3.h"
+#include "rt/nmg.h"
+#include "raytrace.h" /* for rt/calc.h - rt_in_rpp */
#define ISECT_NONE 0
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c 2016-10-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -43,7 +43,8 @@
#include "bn.h"
#include "vmath.h"
-#include "raytrace.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-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_manif.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -33,7 +33,7 @@
#include "vmath.h"
#include "nmg.h"
-#include "raytrace.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-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_mesh.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -35,8 +35,9 @@
#include "bio.h"
#include "vmath.h"
+#include "bn/plane.h"
#include "nmg.h"
-#include "raytrace.h"
+#include "rt/nmg.h"
/**
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c 2016-10-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -35,12 +35,10 @@
#include "vmath.h"
#include "nmg.h"
-#include "rt/geom.h"
-#include "raytrace.h"
+#include "bn/mat.h"
+#include "rt/nmg.h"
#include "rt/nurb.h"
-#include "rt/db4.h" /* for debugging stuff at bottom */
-
/* externed */
uint32_t nmg_debug;
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c 2016-10-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -64,7 +64,7 @@
#include "vmath.h"
#include "nmg.h"
-#include "raytrace.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-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -34,7 +34,7 @@
#include "vmath.h"
#include "nmg.h"
-#include "raytrace.h"
+#include "rt/nmg.h"
#include "rt/nurb.h"
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c 2016-10-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -50,10 +50,10 @@
#include "vmath.h"
#include "bn/plot3.h"
#include "nmg.h"
-#include "raytrace.h"
+#include "rt/nmg.h"
#include "rt/nurb.h"
+#include "raytrace.h" /* RT_ADD_VLIST will be a problem - more rtg_vlfree work
*/
-
#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-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_pr.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -36,7 +36,8 @@
#include "vmath.h"
#include "nmg.h"
-#include "raytrace.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-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_pt_fu.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -33,9 +33,10 @@
#include "bio.h"
#include "vmath.h"
+#include "bn/plane.h"
+#include "bn/plot3.h"
#include "nmg.h"
-#include "raytrace.h"
-#include "bn/plot3.h"
+#include "rt/nmg.h"
/* vertex/edge distance
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_tri.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_tri.c 2016-10-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_tri.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -32,11 +32,13 @@
#include <math.h>
#include "bio.h"
+#include "vmath.h"
+#include "bn/mat.h"
#include "bu/parallel.h"
-#include "vmath.h"
+#include "bn/plane.h"
+#include "bn/plot3.h"
#include "nmg.h"
-#include "raytrace.h"
-#include "bn/plot3.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-12 00:09:06 UTC
(rev 69031)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_visit.c 2016-10-12 00:33:12 UTC
(rev 69032)
@@ -42,7 +42,7 @@
#include "vmath.h"
#include "nmg.h"
-#include "raytrace.h"
+#include "rt/nmg.h"
void
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
