GRAPHICS: Move meshutil.h/.cpp into graphics/

xoreos · Jan 28, 2014 · 9b7724f · 9b7724f
1 parent 1af9717
commit 9b7724f
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 24 deletions.
diff --git a/src/graphics/Makefile.am b/src/graphics/Makefile.am
@@ -12,6 +12,7 @@ noinst_HEADERS = \
                  types.h \
                  util.h \
                  yuv_to_rgb.h \
+                 meshutil.h \
                  renderer.h \
                  graphics.h \
                  textureman.h \
@@ -23,6 +24,7 @@ noinst_HEADERS = \
 
 libgraphics_la_SOURCES = \
                          yuv_to_rgb.cpp \
+                         meshutil.cpp \
                          renderer.cpp \
                          graphics.cpp \
                          textureman.cpp \

diff --git a/src/graphics/aurora/Makefile.am b/src/graphics/aurora/Makefile.am
@@ -4,7 +4,6 @@ noinst_LTLIBRARIES = libaurora.la
 
 noinst_HEADERS = \
                  types.h \
-                 meshutil.h \
                  sceneman.h \
                  renderable.h \
                  cube.h \
@@ -16,7 +15,6 @@ noinst_HEADERS = \
                  $(EMPTY)
 
 libaurora_la_SOURCES = \
-                       meshutil.cpp \
                        sceneman.cpp \
                        renderable.cpp \
                        cube.cpp \

diff --git a/src/graphics/aurora/cube.cpp b/src/graphics/aurora/cube.cpp
@@ -41,10 +41,10 @@
 #include "common/uuid.h"
 
 #include "graphics/util.h"
+#include "graphics/meshutil.h"
 #include "graphics/materialman.h"
 
 #include "graphics/aurora/types.h"
-#include "graphics/aurora/meshutil.h"
 #include "graphics/aurora/cube.h"
 
 static const float  kSide1Vertices[] = { -1, -1, -1, 1, -1, -1, -1, 1, -1, 1, 1, -1 };

diff --git a/src/graphics/aurora/model.cpp b/src/graphics/aurora/model.cpp
@@ -39,11 +39,11 @@
 #include "common/uuid.h"
 
 #include "graphics/util.h"
+#include "graphics/meshutil.h"
 #include "graphics/materialman.h"
 
 #include "graphics/aurora/types.h"
 #include "graphics/aurora/model.h"
-#include "graphics/aurora/meshutil.h"
 
 namespace Graphics {
 

diff --git a/src/graphics/aurora/model.h b/src/graphics/aurora/model.h
@@ -38,8 +38,9 @@
 #include "common/types.h"
 #include "common/ustring.h"
 
+#include "graphics/meshutil.h"
+
 #include "graphics/aurora/renderable.h"
-#include "graphics/aurora/meshutil.h"
 
 namespace Ogre {
 	class SceneNode;

diff --git a/src/graphics/aurora/model_kotor.h b/src/graphics/aurora/model_kotor.h
@@ -34,9 +34,10 @@
 
 #include "graphics/materialman.h"
 
+#include "graphics/meshutil.h"
+
 #include "graphics/aurora/types.h"
 #include "graphics/aurora/model.h"
-#include "graphics/aurora/meshutil.h"
 
 namespace Ogre {
 	class SceneNode;

diff --git a/src/graphics/aurora/model_nwn.h b/src/graphics/aurora/model_nwn.h
@@ -34,9 +34,10 @@
 
 #include "graphics/materialman.h"
 
+#include "graphics/meshutil.h"
+
 #include "graphics/aurora/types.h"
 #include "graphics/aurora/model.h"
-#include "graphics/aurora/meshutil.h"
 
 namespace Ogre {
 	class SceneNode;

diff --git a/src/graphics/aurora/model_nwn2.h b/src/graphics/aurora/model_nwn2.h
@@ -34,9 +34,10 @@
 
 #include "graphics/materialman.h"
 
+#include "graphics/meshutil.h"
+
 #include "graphics/aurora/types.h"
 #include "graphics/aurora/model.h"
-#include "graphics/aurora/meshutil.h"
 
 namespace Ogre {
 	class SceneNode;

diff --git a/src/graphics/aurora/model_witcher.h b/src/graphics/aurora/model_witcher.h
@@ -34,9 +34,10 @@
 
 #include "graphics/materialman.h"
 
+#include "graphics/meshutil.h"
+
 #include "graphics/aurora/types.h"
 #include "graphics/aurora/model.h"
-#include "graphics/aurora/meshutil.h"
 
 namespace Ogre {
 	class SceneNode;

diff --git a/src/graphics/aurora/sceneman.cpp b/src/graphics/aurora/sceneman.cpp
@@ -31,9 +31,9 @@
 #include "common/threads.h"
 
 #include "graphics/util.h"
+#include "graphics/meshutil.h"
 #include "graphics/cameraman.h"
 
-#include "graphics/aurora/meshutil.h"
 #include "graphics/aurora/sceneman.h"
 #include "graphics/aurora/renderable.h"
 #include "graphics/aurora/cube.h"

diff --git a/src/graphics/aurora/meshutil.cpp → src/graphics/meshutil.cpp b/src/graphics/aurora/meshutil.cpp → src/graphics/meshutil.cpp
@@ -23,7 +23,7 @@
  * The Electron engine, Copyright (c) Obsidian Entertainment and BioWare corp.
  */
 
-/** @file graphics/aurora/meshutil.cpp
+/** @file graphics/meshutil.cpp
  *  A scene manager.
  */
 
@@ -37,14 +37,12 @@
 #include "common/error.h"
 #include "common/threads.h"
 
-#include "graphics/aurora/meshutil.h"
+#include "graphics/meshutil.h"
 
 #include "events/requests.h"
 
 namespace Graphics {
 
-namespace Aurora {
-
 VertexDeclaration::VertexDeclaration() : textureUVW(false), faces(0), vertices(0), textures(0) {
 }
 
@@ -219,6 +217,4 @@ Ogre::MeshManager &getOgreMeshManager() {
 	return Ogre::MeshManager::getSingleton();
 }
 
-} // End of namespace Aurora
-
 } // End of namespace Graphics
diff --git a/src/graphics/aurora/meshutil.h → src/graphics/meshutil.h b/src/graphics/aurora/meshutil.h → src/graphics/meshutil.h
@@ -23,12 +23,12 @@
  * The Electron engine, Copyright (c) Obsidian Entertainment and BioWare corp.
  */
 
-/** @file graphics/aurora/meshutil.h
+/** @file graphics/meshutil.h
  *  A scene manager.
  */
 
-#ifndef GRAPHICS_AURORA_MESHUTIL_H
-#define GRAPHICS_AURORA_MESHUTIL_H
+#ifndef GRAPHICS_MESHUTIL_H
+#define GRAPHICS_MESHUTIL_H
 
 #include <vector>
 
@@ -46,8 +46,6 @@ namespace Ogre {
 
 namespace Graphics {
 
-namespace Aurora {
-
 Ogre::MeshManager &getOgreMeshManager();
 
 struct VertexDeclaration {
@@ -75,8 +73,6 @@ void createMesh(Ogre::SubMesh *mesh, uint16 vertexCount, uint16 faceCount,
                 const float *vertices, const float *normals, const uint16 *indices,
                 const float *texCoords1 = 0, const float *texCoords2 = 0, const float *texCoords3 = 0);
 
-} // End of namespace Aurora
-
 } // End of namespace Graphics
 
-#endif // GRAPHICS_AURORA_MESHUTIL_H
+#endif // GRAPHICS_MESHUTIL_H