Revision: 69031
http://sourceforge.net/p/brlcad/code/69031
Author: starseeker
Date: 2016-10-12 00:09:06 +0000 (Wed, 12 Oct 2016)
Log Message:
-----------
Start (slowly) backing non-nmg rt headers out of nmg files and adding specific
needed libbu/libbn includes.
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c
brlcad/trunk/src/librt/primitives/nmg/nmg_ck.c
brlcad/trunk/src/librt/primitives/nmg/nmg_class.c
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
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c 2016-10-11 23:57:55 UTC
(rev 69030)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c 2016-10-12 00:09:06 UTC
(rev 69031)
@@ -40,7 +40,7 @@
#include "vmath.h"
#include "nmg.h"
-#include "raytrace.h"
+#include "rt/nmg.h"
#include "bn/plot3.h"
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_ck.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_ck.c 2016-10-11 23:57:55 UTC
(rev 69030)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_ck.c 2016-10-12 00:09:06 UTC
(rev 69031)
@@ -33,8 +33,9 @@
#include "bio.h"
#include "vmath.h"
+#include "bu/str.h"
#include "nmg.h"
-#include "raytrace.h"
+#include "rt/nmg.h"
/************************************************************************
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_class.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_class.c 2016-10-11 23:57:55 UTC
(rev 69030)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_class.c 2016-10-12 00:09:06 UTC
(rev 69031)
@@ -46,9 +46,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"
#define MAX_DIR_TRYS 10
@@ -986,7 +987,7 @@
nmg_pr_class_status("class_eu_vs_s(): eu vu", euv_cl);
nmg_pr_class_status("class_eu_vs_s(): eumate vu", matev_cl);
- if (RT_G_DEBUG || nmg_debug) {
+ if (nmg_debug) {
/* Do them over, so we can watch */
bu_log("class_eu_vs_s(): Edge not cut, doing it over\n");
NMG_INDEX_CLEAR(classlist[NMG_CLASS_AinB], eu->vu_p);
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_copy.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_copy.c 2016-10-11 23:57:55 UTC
(rev 69030)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_copy.c 2016-10-12 00:09:06 UTC
(rev 69031)
@@ -31,7 +31,8 @@
#include <string.h>
-#include "raytrace.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-11 23:57:55 UTC
(rev 69030)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_eval.c 2016-10-12 00:09:06 UTC
(rev 69031)
@@ -35,7 +35,7 @@
#include "vmath.h"
#include "nmg.h"
-#include "raytrace.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-11 23:57:55 UTC
(rev 69030)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_extrude.c 2016-10-12 00:09:06 UTC
(rev 69031)
@@ -33,10 +33,10 @@
#include "bio.h"
#include "vmath.h"
-#include "rt/db4.h"
+#include "bu/malloc.h"
+#include "bn/plane.h"
#include "nmg.h"
-#include "rt/geom.h"
-#include "raytrace.h"
+#include "rt/nmg.h"
/**
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
