From 86e0d7eae175558ecb7682fe3a377aa412a8c34c Mon Sep 17 00:00:00 2001
From: Shon Ferguson <shonferg@users.sourceforge.net>
Date: Mon, 23 Apr 2007 03:04:17 +0000
Subject: [PATCH] Made sure all classes fell into 3 namespaces: Niflib,
triangle_stripper, and NvTriStrip.
---
NvTriStrip/NvTriStrip.cpp | 6 ++++++
NvTriStrip/NvTriStrip.h | 6 +++++-
NvTriStrip/NvTriStripObjects.cpp | 2 ++
NvTriStrip/NvTriStripObjects.h | 7 ++++++-
NvTriStrip/VertexCache.cpp | 1 +
NvTriStrip/VertexCache.h | 4 ++++
src/ComplexShape.cpp | 19 ++++++++++++-------
src/obj/NiSkinPartition.cpp | 1 +
src/obj/NiTriStripsData.cpp | 1 +
9 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/NvTriStrip/NvTriStrip.cpp b/NvTriStrip/NvTriStrip.cpp
index 5c5572dc..97731543 100644
--- a/NvTriStrip/NvTriStrip.cpp
+++ b/NvTriStrip/NvTriStrip.cpp
@@ -2,6 +2,10 @@
#include "NvTriStripObjects.h"
#include "NvTriStrip.h"
+using namespace NvTriStrip;
+
+namespace NvTriStrip {
+
////////////////////////////////////////////////////////////////////////////////////////
//private data
static unsigned int cacheSize = CACHESIZE_GEFORCE1_2;
@@ -496,3 +500,5 @@ void RemapIndices(const PrimitiveGroup* in_primGroups, const unsigned short numG
delete[] indexCache;
}
+
+} //end namespace
diff --git a/NvTriStrip/NvTriStrip.h b/NvTriStrip/NvTriStrip.h
index 90736d0e..1e136d28 100644
--- a/NvTriStrip/NvTriStrip.h
+++ b/NvTriStrip/NvTriStrip.h
@@ -5,6 +5,8 @@
#define NULL 0
#endif
+namespace NvTriStrip {
+
////////////////////////////////////////////////////////////////////////////////////////
// Public interface for stripifier
////////////////////////////////////////////////////////////////////////////////////////
@@ -140,4 +142,6 @@ bool GenerateStrips(const unsigned short* in_indices, const unsigned int in_numI
void RemapIndices(const PrimitiveGroup* in_primGroups, const unsigned short numGroups,
const unsigned short numVerts, PrimitiveGroup** remappedGroups);
-#endif
+} //End namespace
+
+#endif
\ No newline at end of file
diff --git a/NvTriStrip/NvTriStripObjects.cpp b/NvTriStrip/NvTriStripObjects.cpp
index 6428bf4f..db7b22ab 100644
--- a/NvTriStrip/NvTriStripObjects.cpp
+++ b/NvTriStrip/NvTriStripObjects.cpp
@@ -6,6 +6,8 @@
#include "NvTriStripObjects.h"
#include "VertexCache.h"
+using namespace NvTriStrip;
+
#define CACHE_INEFFICIENCY 6
NvStripifier::NvStripifier()
diff --git a/NvTriStrip/NvTriStripObjects.h b/NvTriStrip/NvTriStripObjects.h
index b4cc1e6a..6c0b42e7 100644
--- a/NvTriStrip/NvTriStripObjects.h
+++ b/NvTriStrip/NvTriStripObjects.h
@@ -7,6 +7,9 @@
#include <list>
#include "VertexCache.h"
+//Wrap these types in a namespace
+namespace NvTriStrip {
+
/////////////////////////////////////////////////////////////////////////////////
//
// Types defined for stripification
@@ -240,4 +243,6 @@ protected:
friend class NvStripInfo;
};
-#endif
+} //End namespace
+
+#endif
\ No newline at end of file
diff --git a/NvTriStrip/VertexCache.cpp b/NvTriStrip/VertexCache.cpp
index 919e47c9..94f9f439 100644
--- a/NvTriStrip/VertexCache.cpp
+++ b/NvTriStrip/VertexCache.cpp
@@ -1,6 +1,7 @@
#include "VertexCache.h"
+using namespace NvTriStrip;
VertexCache::VertexCache()
{
diff --git a/NvTriStrip/VertexCache.h b/NvTriStrip/VertexCache.h
index 5a1ea4ca..05d90ea7 100644
--- a/NvTriStrip/VertexCache.h
+++ b/NvTriStrip/VertexCache.h
@@ -3,6 +3,8 @@
#define VERTEX_CACHE_H
+namespace NvTriStrip {
+
class VertexCache
{
@@ -24,4 +26,6 @@ private:
};
+} //End namespace
+
#endif
diff --git a/src/ComplexShape.cpp b/src/ComplexShape.cpp
index c7ae8f85..dba9dcaf 100644
--- a/src/ComplexShape.cpp
+++ b/src/ComplexShape.cpp
@@ -18,6 +18,9 @@ All rights reserved. Please see niflib.h for licence. */
using namespace Niflib;
+//Wrape these in the Niflib namespace so they don't polute the Class View
+namespace Niflib {
+
struct VertNorm {
Vector3 position;
Vector3 normal;
@@ -91,6 +94,15 @@ struct CompoundVertex {
}
};
+struct MergeLookUp {
+ unsigned int vertIndex;
+ unsigned int normIndex;
+ unsigned int colorIndex;
+ map<unsigned int, unsigned int> uvIndices; //TexCoordSet Index, TexCoord Index
+};
+
+} //End namespace
+
void ComplexShape::SetName( const string & n ) {
name = n;
}
@@ -167,13 +179,6 @@ void ComplexShape::Clear() {
name.clear();
}
-struct MergeLookUp {
- unsigned int vertIndex;
- unsigned int normIndex;
- unsigned int colorIndex;
- map<unsigned int, unsigned int> uvIndices; //TexCoordSet Index, TexCoord Index
-};
-
void ComplexShape::Merge( NiAVObject * root ) {
if ( root == NULL ) {
diff --git a/src/obj/NiSkinPartition.cpp b/src/obj/NiSkinPartition.cpp
index 6f9291fe..4b72f851 100644
--- a/src/obj/NiSkinPartition.cpp
+++ b/src/obj/NiSkinPartition.cpp
@@ -12,6 +12,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "../../NvTriStrip/NvTriStrip.h"
#include <algorithm>
using namespace Niflib;
+using namespace NvTriStrip;
typedef vector<float> WeightList;
typedef vector<unsigned short> BoneList;
diff --git a/src/obj/NiTriStripsData.cpp b/src/obj/NiTriStripsData.cpp
index 488ee3a2..cd5051e1 100644
--- a/src/obj/NiTriStripsData.cpp
+++ b/src/obj/NiTriStripsData.cpp
@@ -7,6 +7,7 @@ All rights reserved. Please see niflib.h for licence. */
using namespace Niflib;
using namespace triangle_stripper;
+using namespace NvTriStrip;
// Helper methods
typedef vector<unsigned short> TriStrip;
--
GitLab