Changeset 3154 for code/branches/pch/src/orxonox

Timestamp:

Jun 13, 2009, 4:30:37 PM (15 years ago)

Author:

rgrieder

Message:

Tried to reduce dependencies in the core. There wasn't much to achieve though…

Location:

code/branches/pch/src/orxonox

Files:

• CameraManager.cc (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (1 diff)
• objects/Radar.cc (modified) (1 diff)
• objects/Radar.h (modified) (1 diff)
• objects/weaponsystem/projectiles/Projectile.cc (modified) (1 diff)
• objects/worldentities/Camera.cc (modified) (1 diff)
• overlays/OverlayGroup.cc (modified) (1 diff)
• overlays/map/Map.cc (modified) (3 diffs)
• overlays/map/Map.h (modified) (2 diffs)

code/branches/pch/src/orxonox/CameraManager.cc

@@ -34 +34 @@
 #include "util/String.h"
 #include "core/GameMode.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
 #include "tools/Shader.h"
 #include "objects/worldentities/Camera.h"

code/branches/pch/src/orxonox/gamestates/GSLevel.cc

@@ -148 +148 @@
         if (show)
         {
-            GUIManager::getInstancePtr()->showGUI("inGameTest");
-            GUIManager::getInstancePtr()->executeCode("showCursor()");
+            GUIManager::getInstance().showGUI("inGameTest");
+            GUIManager::getInstance().executeCode("showCursor()");
             InputManager::getInstance().requestEnterState("guiMouseOnly");
         }
         else
         {
-            GUIManager::getInstancePtr()->executeCode("hideGUI(\"inGameTest\")");
-            GUIManager::getInstancePtr()->executeCode("hideCursor()");
+            GUIManager::getInstance().executeCode("hideGUI(\"inGameTest\")");
+            GUIManager::getInstance().executeCode("hideCursor()");
             InputManager::getInstance().requestLeaveState("guiMouseOnly");
         }

code/branches/pch/src/orxonox/objects/Radar.cc

@@ -37 +37 @@
 #include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
 #include "RadarListener.h"
 

code/branches/pch/src/orxonox/objects/Radar.h

@@ -39 +39 @@
 #include <map>
 #include <string>
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
 #include "core/OrxonoxClass.h"
 #include "objects/Tickable.h"

code/branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc

@@ -34 +34 @@
 #include "core/Executor.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
 #include "tools/ParticleInterface.h"
 

code/branches/pch/src/orxonox/objects/worldentities/Camera.cc

@@ -37 +37 @@
 
 #include "util/Exception.h"
+#include "util/String.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"

code/branches/pch/src/orxonox/overlays/OverlayGroup.cc

@@ -37 +37 @@
 #include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
 #include "core/XMLPort.h"
 #include "OrxonoxOverlay.h"

code/branches/pch/src/orxonox/overlays/map/Map.cc

@@ -31 +31 @@
 #include <OgreBorderPanelOverlayElement.h>
 #include <OgreCamera.h>
+#include <OgreEntity.h>
 #include <OgreHardwarePixelBuffer.h>
 #include <OgreMaterialManager.h>
@@ -50 +51 @@
 #include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
@@ -265 +266 @@
     }
 
-    Ogre::MaterialPtr Map::createRenderCamera(Ogre::Camera * cam, std::string matName)
+    Ogre::MaterialPtr Map::createRenderCamera(Ogre::Camera * cam, const std::string& matName)
     {
         Ogre::TexturePtr rttTex = Ogre::TextureManager::getSingleton().createManual(matName+"_tex", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, Ogre::TEX_TYPE_2D, 512, 512, 0, Ogre::PF_R8G8B8, Ogre::TU_RENDERTARGET);

code/branches/pch/src/orxonox/overlays/map/Map.h

@@ -30 +30 @@
 #include "OrxonoxPrereqs.h"
 
-#include <string>
 #include <OgreMaterial.h>
 
@@ -50 +49 @@
         virtual void changedOwner();
 
-        static Ogre::MaterialPtr createRenderCamera(Ogre::Camera * cam, std::string matName);
+        static Ogre::MaterialPtr createRenderCamera(Ogre::Camera * cam, const std::string& matName);
 
         static void openMap();