Revision: 69068
http://sourceforge.net/p/brlcad/code/69068
Author: brlcad
Date: 2016-10-14 20:56:28 +0000 (Fri, 14 Oct 2016)
Log Message:
-----------
header cleanup, ensure common.h comes before all system headers.
Modified Paths:
--------------
brlcad/trunk/src/libanalyze/MeshHealing/Geometry.cpp
brlcad/trunk/src/libanalyze/MeshHealing/Geometry.h
brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion.cpp
brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion.h
brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.cpp
brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.h
brlcad/trunk/src/libanalyze/MeshHealing/Stitch.cpp
brlcad/trunk/src/libanalyze/MeshHealing/Stitch.h
brlcad/trunk/src/libanalyze/MeshHealing/Zipper.cpp
brlcad/trunk/src/libanalyze/MeshHealing/Zipper.h
Modified: brlcad/trunk/src/libanalyze/MeshHealing/Geometry.cpp
===================================================================
--- brlcad/trunk/src/libanalyze/MeshHealing/Geometry.cpp 2016-10-14
20:56:08 UTC (rev 69067)
+++ brlcad/trunk/src/libanalyze/MeshHealing/Geometry.cpp 2016-10-14
20:56:28 UTC (rev 69068)
@@ -23,10 +23,15 @@
*
*/
-#include "Geometry.h"
+#include "common.h"
+/* interface header */
+#include "./Geometry.h"
+
+/* system implementation headers */
#include <cmath>
+
/* Calculates the determinant of a 3x3 matrix */
double
calcDet(const double m[3][3])
Modified: brlcad/trunk/src/libanalyze/MeshHealing/Geometry.h
===================================================================
--- brlcad/trunk/src/libanalyze/MeshHealing/Geometry.h 2016-10-14 20:56:08 UTC
(rev 69067)
+++ brlcad/trunk/src/libanalyze/MeshHealing/Geometry.h 2016-10-14 20:56:28 UTC
(rev 69068)
@@ -26,8 +26,11 @@
#ifndef SRC_LIBANALYZE_MESHHEALING_GEOMETRY_H_
#define SRC_LIBANALYZE_MESHHEALING_GEOMETRY_H_
+#include "common.h"
+
#include <cstdlib>
+
#define COLL 0
#define CW 1
#define CCW 2
Modified: brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion.cpp
===================================================================
--- brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion.cpp 2016-10-14
20:56:08 UTC (rev 69067)
+++ brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion.cpp 2016-10-14
20:56:28 UTC (rev 69068)
@@ -23,14 +23,20 @@
*
*/
-#include "MeshConversion.h"
+#include "common.h"
+/* interface header */
+#include "./MeshConversion.h"
+
+/* system implementation headers */
#include <cstddef>
#include <iterator>
#include <limits>
-#include "Geometry.h"
+/* local implementation headers */
+#include "./Geometry.h"
+
/* Vertex record function */
void
Modified: brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion.h
===================================================================
--- brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion.h 2016-10-14
20:56:08 UTC (rev 69067)
+++ brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion.h 2016-10-14
20:56:28 UTC (rev 69068)
@@ -26,11 +26,14 @@
#ifndef SRC_LIBANALYZE_MESHHEALING_MESHCONVERSION_H_
#define SRC_LIBANALYZE_MESHHEALING_MESHCONVERSION_H_
+#include "common.h"
+
#include <utility>
#include <vector>
#include "DCEL.h"
+
#define VERTICES_PER_FACE 3
#define UNBOUNDED_FACE 0
Modified: brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.cpp
===================================================================
--- brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.cpp
2016-10-14 20:56:08 UTC (rev 69067)
+++ brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.cpp
2016-10-14 20:56:28 UTC (rev 69068)
@@ -23,18 +23,24 @@
*
*/
-#include "MeshConversion_brlcad.h"
+#include "common.h"
+/* interface header */
+#include "./MeshConversion_brlcad.h"
+
+/* system implementation headers */
+#include <stddef.h>
+#include <utility>
+#include <vector>
+
+/* local implementation headers */
#include <bu/defines.h>
#include <bu/malloc.h>
#include <rt/geom.h>
#include <rt/primitives/bot.h>
-#include <stddef.h>
-#include <utility>
-#include <vector>
+#include "./DCEL.h"
+#include "./Geometry.h"
-#include "DCEL.h"
-#include "Geometry.h"
BrlcadMesh::BrlcadMesh(rt_bot_internal *bot_mesh)
{
Modified: brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.h
===================================================================
--- brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.h
2016-10-14 20:56:08 UTC (rev 69067)
+++ brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.h
2016-10-14 20:56:28 UTC (rev 69068)
@@ -26,10 +26,12 @@
#ifndef SRC_LIBANALYZE_MESHHEALING_MESHCONVERSION_BRLCAD_H_
#define SRC_LIBANALYZE_MESHHEALING_MESHCONVERSION_BRLCAD_H_
-#include "MeshConversion.h"
+#include "./MeshConversion.h"
+
struct rt_bot_internal;
+
class BrlcadMesh: public PolygonalMesh {
public:
Modified: brlcad/trunk/src/libanalyze/MeshHealing/Stitch.cpp
===================================================================
--- brlcad/trunk/src/libanalyze/MeshHealing/Stitch.cpp 2016-10-14 20:56:08 UTC
(rev 69067)
+++ brlcad/trunk/src/libanalyze/MeshHealing/Stitch.cpp 2016-10-14 20:56:28 UTC
(rev 69068)
@@ -23,14 +23,20 @@
*
*/
-#include "Stitch.h"
+#include "common.h"
+/* interface header */
+#include "./Stitch.h"
+
+/* system implementation headers */
#include <stddef.h>
#include <algorithm>
#include <utility>
-#include "Geometry.h"
+/* local implementation headers */
+#include "./Geometry.h"
+
void
stitchGaps(PolygonalMesh *polymesh, DCEL_Edge* start_A, DCEL_Edge* start_B,
double tolerance)
{
Modified: brlcad/trunk/src/libanalyze/MeshHealing/Stitch.h
===================================================================
--- brlcad/trunk/src/libanalyze/MeshHealing/Stitch.h 2016-10-14 20:56:08 UTC
(rev 69067)
+++ brlcad/trunk/src/libanalyze/MeshHealing/Stitch.h 2016-10-14 20:56:28 UTC
(rev 69068)
@@ -26,9 +26,9 @@
#ifndef SRC_LIBANALYZE_MESHHEALING_STITCH_H_
#define SRC_LIBANALYZE_MESHHEALING_STITCH_H_
-#include "MeshConversion.h"
+#include "./MeshConversion.h"
+/*#include "./MeshConversion_brlcad.h"*/
-/*#include "MeshConversion_brlcad.h"*/
/* Function to stitch gaps of chain start_A to end_A with start_B to end_B
* Advancing rule is that whichever chain has a triangle with the other other
chain with the lesser perimeter,
Modified: brlcad/trunk/src/libanalyze/MeshHealing/Zipper.cpp
===================================================================
--- brlcad/trunk/src/libanalyze/MeshHealing/Zipper.cpp 2016-10-14 20:56:08 UTC
(rev 69067)
+++ brlcad/trunk/src/libanalyze/MeshHealing/Zipper.cpp 2016-10-14 20:56:28 UTC
(rev 69068)
@@ -23,16 +23,22 @@
*
*/
-#include "Zipper.h"
+#include "common.h"
+/* interface header */
+#include "./Zipper.h"
+
+/* system implementation headers */
#include <stddef.h>
#include <climits>
#include <utility>
#include <vector>
+/* local implementation headers */
#include "vmath.h"
-#include "Geometry.h"
+#include "./Geometry.h"
+
void
calcFeaturePair(PolygonalMesh *polymesh, queue_element *node)
{
Modified: brlcad/trunk/src/libanalyze/MeshHealing/Zipper.h
===================================================================
--- brlcad/trunk/src/libanalyze/MeshHealing/Zipper.h 2016-10-14 20:56:08 UTC
(rev 69067)
+++ brlcad/trunk/src/libanalyze/MeshHealing/Zipper.h 2016-10-14 20:56:28 UTC
(rev 69068)
@@ -26,11 +26,14 @@
#ifndef SRC_LIBANALYZE_MESHHEALING_ZIPPER_H_
#define SRC_LIBANALYZE_MESHHEALING_ZIPPER_H_
+#include "common.h"
+
#include <queue>
#include <vector>
-#include "MeshConversion.h"
+#include "./MeshConversion.h"
+
struct queue_element {
DCEL_Vertex *vertex;
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
