GRAPHICS: Move Renderable into graphics/

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

Hide file tree

Showing 10 changed files with 15 additions and 24 deletions.
diff --git a/src/engines/kotor/area.cpp b/src/engines/kotor/area.cpp
@@ -386,7 +386,7 @@ void Area::loadObjectModels() {
 }
 
 Engines::KotOR::Object *Area::getObjectAt(int x, int y, float &distance) const {
-	Graphics::Aurora::Renderable *r = SceneMan.getRenderableAt(x, y, Graphics::Aurora::kSelectableRenderable, distance);
+	Graphics::Renderable *r = SceneMan.getRenderableAt(x, y, Graphics::Aurora::kSelectableRenderable, distance);
 	if (!r)
 		return 0;
 

diff --git a/src/engines/nwn/area.cpp b/src/engines/nwn/area.cpp
@@ -498,7 +498,7 @@ void Area::loadCreatures(const Aurora::GFFList &list) {
 }
 
 Engines::NWN::Object *Area::getObjectAt(int x, int y, float &distance) const {
-	Graphics::Aurora::Renderable *r = SceneMan.getRenderableAt(x, y, Graphics::Aurora::kSelectableRenderable, distance);
+	Graphics::Renderable *r = SceneMan.getRenderableAt(x, y, Graphics::Aurora::kSelectableRenderable, distance);
 	if (!r)
 		return 0;
 

diff --git a/src/graphics/Makefile.am b/src/graphics/Makefile.am
@@ -20,6 +20,7 @@ noinst_HEADERS = \
                  cursor.h \
                  cursorman.h \
                  cameraman.h \
+                 renderable.h \
                  $(EMPTY)
 
 libgraphics_la_SOURCES = \
@@ -32,6 +33,7 @@ libgraphics_la_SOURCES = \
                          cursor.cpp \
                          cursorman.cpp \
                          cameraman.cpp \
+                         renderable.cpp \
                          $(EMPTY)
 
 if DARWIN

diff --git a/src/graphics/aurora/Makefile.am b/src/graphics/aurora/Makefile.am
@@ -5,7 +5,6 @@ noinst_LTLIBRARIES = libaurora.la
 noinst_HEADERS = \
                  types.h \
                  sceneman.h \
-                 renderable.h \
                  cube.h \
                  model.h \
                  model_nwn.h \
@@ -16,7 +15,6 @@ noinst_HEADERS = \
 
 libaurora_la_SOURCES = \
                        sceneman.cpp \
-                       renderable.cpp \
                        cube.cpp \
                        model.cpp \
                        model_nwn.cpp \

diff --git a/src/graphics/aurora/cube.h b/src/graphics/aurora/cube.h
@@ -30,7 +30,7 @@
 #ifndef GRAPHICS_AURORA_CUBE_H
 #define GRAPHICS_AURORA_CUBE_H
 
-#include "graphics/aurora/renderable.h"
+#include "graphics/renderable.h"
 
 namespace Ogre {
 	class Entity;

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

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

diff --git a/src/graphics/aurora/sceneman.h b/src/graphics/aurora/sceneman.h
@@ -37,9 +37,10 @@
 
 namespace Graphics {
 
+class Renderable;
+
 namespace Aurora {
 
-class Renderable;
 class Cube;
 class Model;
 

diff --git a/src/graphics/aurora/renderable.cpp → src/graphics/renderable.cpp b/src/graphics/aurora/renderable.cpp → src/graphics/renderable.cpp
@@ -23,7 +23,7 @@
  * The Electron engine, Copyright (c) Obsidian Entertainment and BioWare corp.
  */
 
-/** @file graphics/aurora/renderable.cpp
+/** @file graphics/renderable.cpp
  *  Base class for renderable objects.
  */
 
@@ -32,13 +32,10 @@
 #include <OgreSceneManager.h>
 
 #include "graphics/util.h"
-
-#include "graphics/aurora/renderable.h"
+#include "graphics/renderable.h"
 
 namespace Graphics {
 
-namespace Aurora {
-
 Renderable::Renderable() : _rootNode(0), _visible(false) {
 	_basePosition[0] = 0.0;
 	_basePosition[1] = 0.0;
@@ -204,6 +201,4 @@ void Renderable::destroyAnimation(Ogre::Animation *anim) {
 	destroyAnimation(anim->getName().c_str());
 }
 
-} // End of namespace Aurora
-
 } // End of namespace Graphics
diff --git a/src/graphics/aurora/renderable.h → src/graphics/renderable.h b/src/graphics/aurora/renderable.h → src/graphics/renderable.h
@@ -23,12 +23,12 @@
  * The Electron engine, Copyright (c) Obsidian Entertainment and BioWare corp.
  */
 
-/** @file graphics/aurora/renderable.h
+/** @file graphics/renderable.h
  *  Base class for renderable objects.
  */
 
-#ifndef GRAPHICS_AURORA_RENDERABLE_H
-#define GRAPHICS_AURORA_RENDERABLE_H
+#ifndef GRAPHICS_RENDERABLE_H
+#define GRAPHICS_RENDERABLE_H
 
 #include "common/ustring.h"
 
@@ -39,8 +39,6 @@ namespace Ogre {
 
 namespace Graphics {
 
-namespace Aurora {
-
 class Renderable {
 public:
 	Renderable();
@@ -102,8 +100,6 @@ class Renderable {
 	void destroyAnimation(Ogre::Animation *anim);
 };
 
-} // End of namespace Aurora
-
 } // End of namespace Graphics
 
-#endif // GRAPHICS_AURORA_RENDERABLE_H
+#endif // GRAPHICS_RENDERABLE_H