Changeset 3157

Timestamp:

Jun 13, 2009, 5:03:51 PM (15 years ago)

Author:

rgrieder

Message:

Small changes and cleaned out RadarViewable which saves me probably more than a minute when recompiling…

Location:

code/branches/pch/src/orxonox

Files:

• gamestates/GSDedicated.cc (modified) (1 diff)
• objects/RadarViewable.cc (modified) (1 diff)
• objects/RadarViewable.h (modified) (2 diffs)
• objects/pickup/PickupInventory.cc (modified) (1 diff)
• objects/pickup/PickupSpawner.cc (modified) (1 diff)
• sound/CMakeLists.txt (modified) (1 diff)
• sound/SoundBase.cc (modified) (2 diffs)
• sound/SoundBase.h (modified) (1 diff)

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

@@ -33 +33 @@
 #include "core/Game.h"
 #include "core/GameMode.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
 #include "network/Server.h"
 #include "objects/Tickable.h"

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

@@ -30 +30 @@
 
 #include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreEntity.h>
+#include <OgreManualObject.h>
+
 #include "util/Debug.h"
-#include "util/Exception.h"
+#include "util/String.h"
 #include "core/CoreIncludes.h"
+#include "orxonox/tools/DynamicLines.h"
 #include "objects/worldentities/WorldEntity.h"
 #include "objects/Radar.h"
-#include "util/String.h"
-#include <OgreManualObject.h>
 #include "overlays/map/Map.h"
-#include "orxonox/tools/DynamicLines.h"
 
 namespace orxonox

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
 #include <string>
 #include <cassert>
+
 #include "util/Math.h"
 #include "util/Debug.h"
 #include "core/OrxonoxClass.h"
-
-#include <string>
-#include <OgreSceneNode.h>
-#include <OgreEntity.h>
-#include <OgreManualObject.h>
-#include "orxonox/tools/DynamicLines.h"
 
 namespace orxonox
@@ -110 +106 @@
         void updateMapPosition();
         bool isHumanShip_;
-        inline std::string getUniqueId()
+        inline const std::string& getUniqueId()
         {
             return this->uniqueId_;

code/branches/pch/src/orxonox/objects/pickup/PickupInventory.cc

@@ -86 +86 @@
     {
         if(PickupInventory::getSingleton()->isVisible()) {
-            GUIManager::getInstancePtr()->executeCode("hideGUI(\"PickupInventory\")");
-            GUIManager::getInstancePtr()->executeCode("hideCursor()");
+            GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
+            GUIManager::getInstance().executeCode("hideCursor()");
             InputManager::getInstance().requestLeaveState("guiMouseOnly");
         }
         else
         {
-            GUIManager::getInstancePtr()->showGUI("PickupInventory");
-            GUIManager::getInstancePtr()->executeCode("showCursor()");
+            GUIManager::getInstance().showGUI("PickupInventory");
+            GUIManager::getInstance().executeCode("showCursor()");
             InputManager::getInstance().requestEnterState("guiMouseOnly");
         }

code/branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -95 +95 @@
         //  & load the GUI itself too, along with some empty windows
         //   = even less delays
-        GUIManager::getInstancePtr()->showGUI("PickupInventory");
-        GUIManager::getInstancePtr()->executeCode("hideGUI(\"PickupInventory\")");
+        GUIManager::getInstance().showGUI("PickupInventory");
+        GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
         PickupInventory::getSingleton();
     }

code/branches/pch/src/orxonox/sound/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
-    SoundManager.h
-    SoundBase.h
-    SoundMainMenu.h
-
     SoundManager.cc
     SoundBase.cc

code/branches/pch/src/orxonox/sound/SoundBase.cc

@@ -29 +29 @@
 #include "SoundBase.h"
 
+#include <string>
 #include <vector>
 #include <AL/alut.h>
@@ -181 +182 @@
     }
 
-    ALuint SoundBase::loadOggFile(std::string filename)
+    ALuint SoundBase::loadOggFile(const std::string& filename)
     {
         char inbuffer[4096];

code/branches/pch/src/orxonox/sound/SoundBase.h

@@ -57 +57 @@
 
     private:
-        ALuint loadOggFile(std::string filename);
+        ALuint loadOggFile(const std::string& filename);
         ALuint source_;
         ALuint buffer_;