Changeset 5695 for code/trunk/src/orxonox

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/LevelManager.cc (modified) (2 diffs)
• src/orxonox/Main.cc (modified) (2 diffs)
• 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)
• src/orxonox/objects/Level.cc (modified) (2 diffs)
• src/orxonox/objects/Script.cc (modified) (1 diff)
• src/orxonox/objects/Script.h (modified) (1 diff)
• src/orxonox/orxonox-main.vcproj.user.in (modified) (4 diffs)
• src/orxonox/sound/SoundBase.cc (modified) (3 diffs)
• src/orxonox/sound/SoundBase.h (modified) (1 diff)
• src/orxonox/tools/CMakeLists.txt (modified) (1 diff)
• src/orxonox/tools/Mesh.cc (modified) (2 diffs)
• src/orxonox/tools/ResourceCollection.cc (copied) (copied from code/branches/resource2/src/orxonox/tools/ResourceCollection.cc)
• src/orxonox/tools/ResourceCollection.h (copied) (copied from code/branches/resource2/src/orxonox/tools/ResourceCollection.h) (2 diffs)
• src/orxonox/tools/ResourceLocation.cc (copied) (copied from code/branches/resource2/src/orxonox/tools/ResourceLocation.cc)
• src/orxonox/tools/ResourceLocation.h (copied) (copied from code/branches/resource2/src/orxonox/tools/ResourceLocation.h) (2 diffs)

code/trunk/src/orxonox/LevelManager.cc

@@ -30 +30 @@
 
 #include <map>
-#include <boost/filesystem.hpp>
+#include <OgreResourceGroupManager.h>
 
 #include "core/CommandLine.h"
@@ -135 +135 @@
         availableLevels_.clear();
 
-        boost::filesystem::directory_iterator file(Core::getMediaPathString() + "levels");
-        boost::filesystem::directory_iterator end;
+        availableLevels_ = *Ogre::ResourceGroupManager::getSingleton().findResourceNames(
+            Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, "*.oxw");
 
-        while (file != end)
-        {
-            if (!boost::filesystem::is_directory(*file) && file->string()[file->string().length()-1] != '~')
+        for (std::vector<std::string>::iterator it = availableLevels_.begin(); it != availableLevels_.end();)
+            if (it->find("old/") == 0)
+                it = availableLevels_.erase(it);
+            else
             {
-                std::string filename = file->path().leaf();
-                if (filename.length() > 4)
-                    availableLevels_.push_back(filename.substr(0,filename.length()-4));
+                size_t pos = it->find(".oxw");
+                *it = it->substr(0, pos);
+                ++it;
             }
-            ++file;
-        }
     }
 }

code/trunk/src/orxonox/Main.cc

@@ -40 +40 @@
 #include "core/CommandLine.h"
 #include "core/Game.h"
+#include "core/LuaState.h"
+#include "ToluaBindOrxonox.h"
 #include "Main.h"
 
@@ -48 +50 @@
 SetCommandLineSwitch(dedicated).information("Start in dedicated server mode");
 SetCommandLineSwitch(standalone).information("Start in standalone mode");
+
+DeclareToluaInterface(Orxonox);
 
 namespace orxonox

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();
     }

code/trunk/src/orxonox/objects/Level.cc

@@ -53 +53 @@
         this->registerVariables();
         this->xmlfilename_ = this->getFilename();
-
-        if (this->xmlfilename_.length() >= Core::getMediaPathString().length())
-            this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPathString().length());
     }
 
@@ -101 +98 @@
         mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
 
-        this->xmlfile_ = new XMLFile(Core::getMediaPathString() + this->xmlfilename_, mask);
+        this->xmlfile_ = new XMLFile(mask, this->xmlfilename_);
 
         Loader::open(this->xmlfile_);

code/trunk/src/orxonox/objects/Script.cc

@@ -29 +29 @@
 #include "Script.h"
 
-#include <tinyxml/ticpp.h>
 #include "core/CoreIncludes.h"
-#include "core/LuaBind.h"
+#include "core/LuaState.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
 {
-  CreateFactory(Script);
+    CreateFactory(Script);
 
-  Script::Script(BaseObject* creator) : BaseObject(creator)
-  {
-    RegisterObject(Script);
+    Script::Script(BaseObject* creator) : BaseObject(creator)
+    {
+        RegisterObject(Script);
 
-    code_ = "";
-  }
+        // Get a new LuaState
+        luaState_ = new LuaState();
+    }
 
-  Script::~Script()
-  {
-  }
+    Script::~Script()
+    {
+        if (this->isInitialized())
+            delete luaState_;
+    }
 
-  /**
-  @brief XML loading and saving.
-  @param xmlelement The XML-element
-  @param loading Loading (true) or saving (false)
-   */
-  void Script::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-  {
-    BaseObject::XMLPort(xmlelement, mode);
+    void Script::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        BaseObject::XMLPort(xmlelement, mode);
 
-    code_ = xmlelement.GetText(false);
-  }
+        XMLPortParam(Script, "code", setCode, getCode, xmlelement, mode);
+    }
 
-  void Script::execute()
-  {
-    LuaBind& lua = LuaBind::getInstance();
-    lua.loadString(this->code_);
-    lua.run();
-  }
+    void Script::execute()
+    {
+        luaState_->doString(code_);
+    }
 }

code/trunk/src/orxonox/objects/Script.h

@@ -37 +37 @@
 namespace orxonox
 {
-  class _OrxonoxExport Script : public BaseObject
-  {
+    class _OrxonoxExport Script : public BaseObject
+    {
     public:
-      Script(BaseObject* creator);
-      ~Script();
-      void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-      void execute();
+        Script(BaseObject* creator);
+        ~Script();
+        void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        void execute();
+
+        void setCode(const std::string& code) { code_ = code; }
+        const std::string& getCode() const { return code_; }
 
     private:
-      std::string code_;
-  };
+        std::string code_;
+        LuaState* luaState_;
+    };
 }
 

code/trunk/src/orxonox/orxonox-main.vcproj.user.in

@@ -11 +11 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+                                Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />
@@ -20 +20 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+                                Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />
@@ -29 +29 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+                                Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />
@@ -38 +38 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+                                Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />

code/trunk/src/orxonox/sound/SoundBase.cc

@@ -36 +36 @@
 #include "util/Math.h"
 #include "core/Core.h"
+#include "core/Resource.h"
 #include "orxonox/objects/worldentities/WorldEntity.h"
 #include "SoundManager.h"
@@ -134 +135 @@
     }
 
-    bool SoundBase::loadFile(std::string filename) {
-        filename = Core::getMediaPathString() + "/audio/" + filename;
-
+    bool SoundBase::loadFile(const std::string& filename) {
         if(!SoundManager::getInstance().isSoundAvailable())
         {
@@ -144 +143 @@
 
         COUT(3) << "Sound: OpenAL ALUT: loading file " << filename << std::endl;
-        this->buffer_ = alutCreateBufferFromFile(filename.c_str());
+        // Get DataStream from the resources
+        shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(filename);
+        if (fileInfo == NULL) {
+            COUT(2) << "Warning: Sound file '" << filename << "' not found" << std::endl;
+            return false;
+        }
+        DataStreamPtr stream = Resource::open(filename);
+        // Read everything into a temporary buffer
+        char* buffer = new char[fileInfo->size];
+        stream->read(buffer, fileInfo->size);
+
+        this->buffer_ = alutCreateBufferFromFileImage(buffer, fileInfo->size);
+        delete[] buffer;
+
         if(this->buffer_ == AL_NONE) {
             COUT(2) << "Sound: OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;

code/trunk/src/orxonox/sound/SoundBase.h

@@ -55 +55 @@
         bool isStopped();
 
-        bool loadFile(std::string filename);
+        bool loadFile(const std::string& filename);
 
     private:

code/trunk/src/orxonox/tools/CMakeLists.txt

@@ -5 +5 @@
   Mesh.cc
   ParticleInterface.cc
+  ResourceCollection.cc
+  ResourceLocation.cc
   Shader.cc
   TextureGenerator.cc

code/trunk/src/orxonox/tools/Mesh.cc

@@ -71 +71 @@
                 this->entity_->setCastShadows(this->bCastShadows_);
 
+#if OGRE_VERSION < 0x010600
                 this->entity_->setNormaliseNormals(true);
                 /*
@@ -79 +80 @@
                     I don't know exactly what this means, but I put this here if there will be problems with shaders.
                 */
+#endif
             }
             catch (...)

code/trunk/src/orxonox/tools/ResourceCollection.h

@@ -30 +30 @@
 #define _ResourceCollection_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include <string>
@@ -40 +40 @@
     class ResourceLocation;
 
-    class _OrxonoxExport ResourceCollection : public BaseObject
+    class _ToolsExport ResourceCollection : public BaseObject
     {
     public:

code/trunk/src/orxonox/tools/ResourceLocation.h

@@ -30 +30 @@
 #define _ResourceLocation_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include <string>
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport ResourceLocation : public BaseObject
+    class _ToolsExport ResourceLocation : public BaseObject
     {
         // for load/unload