From c3a492bf7463dd38e4a2240902b5b6fdd5f6d6e4 Mon Sep 17 00:00:00 2001 From: Jason Hooks Date: Tue, 25 Oct 2011 14:06:44 -0400 Subject: [PATCH] Debugging file renamed --- apps/openmw/CMakeLists.txt | 4 ++-- apps/openmw/mwrender/{mwscene.cpp => debugging.cpp} | 2 +- apps/openmw/mwrender/{mwscene.hpp => debugging.hpp} | 0 apps/openmw/mwrender/exterior.cpp | 2 -- apps/openmw/mwrender/interior.cpp | 1 - apps/openmw/mwworld/scene.hpp | 1 - apps/openmw/mwworld/world.cpp | 1 - apps/openmw/mwworld/world.hpp | 2 +- 8 files changed, 4 insertions(+), 9 deletions(-) rename apps/openmw/mwrender/{mwscene.cpp => debugging.cpp} (97%) rename apps/openmw/mwrender/{mwscene.hpp => debugging.hpp} (100%) diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index 9510273af..86e0adc8d 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -17,7 +17,7 @@ source_group(game FILES ${GAME} ${GAME_HEADER}) set(GAMEREND mwrender/renderingmanager.cpp - mwrender/mwscene.cpp + mwrender/debugging.cpp mwrender/cellimp.cpp mwrender/interior.cpp mwrender/exterior.cpp @@ -28,7 +28,7 @@ set(GAMEREND_HEADER mwrender/renderingmanager.hpp mwrender/cell.hpp mwrender/cellimp.hpp - mwrender/mwscene.hpp + mwrender/debugging.hpp mwrender/interior.hpp mwrender/exterior.hpp mwrender/sky.hpp diff --git a/apps/openmw/mwrender/mwscene.cpp b/apps/openmw/mwrender/debugging.cpp similarity index 97% rename from apps/openmw/mwrender/mwscene.cpp rename to apps/openmw/mwrender/debugging.cpp index 0201c8208..60b299acd 100644 --- a/apps/openmw/mwrender/mwscene.cpp +++ b/apps/openmw/mwrender/debugging.cpp @@ -1,4 +1,4 @@ -#include "mwscene.hpp" +#include "debugging.hpp" #include diff --git a/apps/openmw/mwrender/mwscene.hpp b/apps/openmw/mwrender/debugging.hpp similarity index 100% rename from apps/openmw/mwrender/mwscene.hpp rename to apps/openmw/mwrender/debugging.hpp diff --git a/apps/openmw/mwrender/exterior.cpp b/apps/openmw/mwrender/exterior.cpp index 358e19a7c..1118156ba 100644 --- a/apps/openmw/mwrender/exterior.cpp +++ b/apps/openmw/mwrender/exterior.cpp @@ -8,9 +8,7 @@ #include #include -#include "mwscene.hpp" #include -#include "mwscene.hpp" #include using namespace MWRender; diff --git a/apps/openmw/mwrender/interior.cpp b/apps/openmw/mwrender/interior.cpp index cbbab484a..aa13f2292 100644 --- a/apps/openmw/mwrender/interior.cpp +++ b/apps/openmw/mwrender/interior.cpp @@ -9,7 +9,6 @@ #include #include -#include "mwscene.hpp" #include #include diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp index 68b65adfa..6af86a071 100644 --- a/apps/openmw/mwworld/scene.hpp +++ b/apps/openmw/mwworld/scene.hpp @@ -8,7 +8,6 @@ #include -#include "../mwrender/mwscene.hpp" #include "physicssystem.hpp" #include "refdata.hpp" diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index 1949b6731..dfacffc5b 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -208,7 +208,6 @@ namespace MWWorld mPhysEngine = physEng; mWorldScene = new Scene(environment, this, mRendering.getOgreRenderer(), mRendering.getRoot(), mPhysics); - std::cout << "After mworldscene\n"; } diff --git a/apps/openmw/mwworld/world.hpp b/apps/openmw/mwworld/world.hpp index 5d196278a..b1ce69b3d 100644 --- a/apps/openmw/mwworld/world.hpp +++ b/apps/openmw/mwworld/world.hpp @@ -8,7 +8,7 @@ #include -#include "../mwrender/mwscene.hpp" +#include "../mwrender/debugging.hpp" #include "../mwrender/renderingmanager.hpp" #include "refdata.hpp"