Changeset 5695 for code/trunk/src/orxonox/gamestates

Timestamp:

Aug 30, 2009, 2:22:00 AM (15 years ago)

Author:

rgrieder

Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSDedicated.cc (modified) (2 diffs)
• src/orxonox/gamestates/GSGraphics.cc (modified) (1 diff)
• src/orxonox/gamestates/GSLevel.cc (modified) (3 diffs)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (2 diffs)
• src/orxonox/gamestates/GSRoot.cc (modified) (3 diffs)

code/trunk/src/orxonox/gamestates/GSDedicated.cc

@@ -28 +28 @@
 
 #include "GSDedicated.h"
+
+#include <iomanip>
+#include <iostream>
+#include <boost/bind.hpp>
 
 #include "util/Debug.h"
@@ -37 +41 @@
 #include "core/GameMode.h"
 #include "network/Server.h"
-
-#include <iostream>
-#include <iomanip>
-#include <boost/bind.hpp>
 
 #ifdef ORXONOX_PLATFORM_UNIX

code/trunk/src/orxonox/gamestates/GSGraphics.cc

@@ -96 +96 @@
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile(Core::getMediaPathString() + "overlay/debug.oxo");
+        this->debugOverlay_ = new XMLFile("debug.oxo");
         Loader::open(debugOverlay_);
 

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -29 +29 @@
 
 #include "GSLevel.h"
+
+#include <OgreCompositorManager.h>
 
 #include "core/input/InputManager.h"
@@ -166 +168 @@
 */
 
+        if (GameMode::showsGraphics())
+        {
+            // unload all compositors (this is only necessary because we don't yet destroy all resources!)
+            Ogre::CompositorManager::getSingleton().removeAll();
+        }
 
         // this call will delete every BaseObject!
@@ -229 +236 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + LevelManager::getInstance().getDefaultLevel());
+        startFile_s = new XMLFile(LevelManager::getInstance().getDefaultLevel());
         Loader::open(startFile_s);
     }

code/trunk/src/orxonox/gamestates/GSMainMenu.cc

@@ -52 +52 @@
         inputState_->setHandler(GUIManager::getInstancePtr());
         inputState_->setJoyStickHandler(&InputHandler::EMPTY);
+        inputState_->setIsExclusiveMouse(false);
 
         // create an empty Scene
@@ -70 +71 @@
     {
         // show main menu
-        GUIManager::getInstance().showGUI("mainmenu_4");
+        GUIManager::getInstance().showGUI("MainMenu");
         GUIManager::getInstance().setCamera(this->camera_);
         GraphicsManager::getInstance().setCamera(this->camera_);

code/trunk/src/orxonox/gamestates/GSRoot.cc

@@ -33 +33 @@
 #include "core/Game.h"
 #include "core/GameMode.h"
-#include "core/LuaBind.h"
 #include "network/NetworkFunction.h"
-#include "ToluaBindCore.h"
-#include "ToluaBindOrxonox.h"
 #include "tools/Timer.h"
 #include "tools/interfaces/TimeFactorListener.h"
@@ -54 +51 @@
         this->ccSetTimeFactor_ = 0;
         this->ccPause_ = 0;
-
-        // Tell LuaBind about all tolua interfaces
-        LuaBind::getInstance().addToluaInterface(&tolua_Core_open, "Core");
-        LuaBind::getInstance().addToluaInterface(&tolua_Orxonox_open, "Orxonox");
     }
 
@@ -86 +79 @@
         }
 
-        // create the global LevelManager
+        // create the LevelManager
         this->levelManager_ = new LevelManager();
     }