Changeset 8288 for code/branches

Timestamp:

Apr 21, 2011, 8:29:30 PM (14 years ago)

Author:

rgrieder

Message:

Resource::DEFAULT_GROUP has been replaced and Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME should not be used anymore in Orxonox.

Location:

code/branches/kicklib2/src/modules/designtools

Files:

• ScreenshotManager.cc (modified) (1 diff)
• SkyboxGenerator.cc (modified) (3 diffs)

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

@@ -111 +111 @@
 
             // Create temporary texture
-            this->tempTexture_ = Ogre::TextureManager::getSingleton().createManual("ScreenShotTex", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, Ogre::TEX_TYPE_2D, this->windowWidth_, this->windowHeight_, 0, Ogre::PF_B8G8R8, Ogre::TU_RENDERTARGET);
+            this->tempTexture_ = Ogre::TextureManager::getSingleton().createManual("ScreenShotTex",
+                Resource::getDefaultResourceGroup(), Ogre::TEX_TYPE_2D, this->windowWidth_,
+                this->windowHeight_, 0, Ogre::PF_B8G8R8, Ogre::TU_RENDERTARGET);
 
             // Get the current render target of the temporary texture

code/branches/kicklib2/src/modules/designtools/SkyboxGenerator.cc

@@ -172 +172 @@
                 this->setupRenderWindow(renderWindow);
                 // Add the log path to the standard resource group.
-                Ogre::ResourceGroupManager::getSingleton().addResourceLocation(PathConfig::getInstance().getLogPathString(), "FileSystem", Resource::DEFAULT_GROUP);
+                Ogre::ResourceGroupManager::getSingleton().addResourceLocation(PathConfig::getInstance().getLogPathString(), "FileSystem", Resource::getDefaultResourceGroup());
                 
                 COUT(4) << "Setting up SkyboxGenerator..." << endl;
@@ -207 +207 @@
                 this->restoreRenderWindow(renderWindow);
                 // Remove the log path from the standard resource group.
-                Ogre::ResourceGroupManager::getSingleton().removeResourceLocation(PathConfig::getInstance().getLogPathString(), Resource::DEFAULT_GROUP);
+                Ogre::ResourceGroupManager::getSingleton().removeResourceLocation(PathConfig::getInstance().getLogPathString(), Resource::getDefaultResourceGroup());
                 
                 // Reset the flow parameters for the next skybox generation.
@@ -310 +310 @@
         // If someone figures this out, feel free to adjust.
         image = new Ogre::Image();
-        image->load(name, Resource::DEFAULT_GROUP);
+        image->load(name, Resource::getDefaultResourceGroup());
         image->resize(this->size_, this->size_);
         image->save(PathConfig::getInstance().getLogPathString()+name);