Changeset 8081

Timestamp:

Mar 17, 2011, 2:28:23 AM (14 years ago)

Author:

rgrieder

Message:

Fixed serious static initialisation problem. And I thought we caught them all…
Also replaced remaining references to Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP with our own code.

Location:

code/branches/kicklib/src

Files:

• libraries/core/Resource.cc (modified) (1 diff)
• libraries/core/Resource.h (modified) (1 diff)
• libraries/tools/ResourceCollection.cc (modified) (1 diff)
• modules/designtools/ScreenshotManager.cc (modified) (2 diffs)

code/branches/kicklib/src/libraries/core/Resource.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    std::string Resource::DEFAULT_GROUP(Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+    const std::string& Resource::getDefaultResourceGroup()
+    {
+        return Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME;
+    }
 
     DataStreamPtr Resource::open(const std::string& name)
     {
         return Ogre::ResourceGroupManager::getSingleton().openResource(name,
-            Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true);
+            getDefaultResourceGroup(), true);
     }
 

code/branches/kicklib/src/libraries/core/Resource.h

@@ -137 +137 @@
 
         //! Name of the default resource group (usually "General")
-        static std::string DEFAULT_GROUP;
+        static const std::string& getDefaultResourceGroup();
 
     private:

code/branches/kicklib/src/libraries/tools/ResourceCollection.cc

@@ -45 +45 @@
 
         // Default group is "General"
-        this->setResourceGroup(Resource::DEFAULT_GROUP);
+        this->setResourceGroup(Resource::getDefaultResourceGroup());
     }
 

code/branches/kicklib/src/modules/designtools/ScreenshotManager.cc

@@ -12 +12 @@
 #include "core/GraphicsManager.h"
 #include "core/PathConfig.h"
+#include "core/Resource.h"
 #include "core/command/ConsoleCommand.h"
 
@@ -40 +41 @@
         //create temporary texture
         mTempTex = Ogre::TextureManager::getSingleton().createManual("ScreenShotTex",
-                                                                  Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, Ogre::TEX_TYPE_2D,
-                                                                    mWindowWidth, mWindowHeight,0, Ogre::PF_B8G8R8, Ogre::TU_RENDERTARGET);
+                       Resource::getDefaultResourceGroup(), Ogre::TEX_TYPE_2D,
+                       mWindowWidth, mWindowHeight,0, Ogre::PF_B8G8R8, Ogre::TU_RENDERTARGET);
 
         //get The current Render Target of the temp Texture