[Orxonox-commit 3603] r8288 - code/branches/kicklib2/src/modules/designtools

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-04-21 20:29:30 +0200 (Thu, 21 Apr 2011)
New Revision: 8288

Modified:
   code/branches/kicklib2/src/modules/designtools/ScreenshotManager.cc
   code/branches/kicklib2/src/modules/designtools/SkyboxGenerator.cc
Log:
Resource::DEFAULT_GROUP has been replaced and Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME should not be used anymore in Orxonox.

Modified: code/branches/kicklib2/src/modules/designtools/ScreenshotManager.cc
===================================================================
--- code/branches/kicklib2/src/modules/designtools/ScreenshotManager.cc	2011-04-21 18:22:36 UTC (rev 8287)
+++ code/branches/kicklib2/src/modules/designtools/ScreenshotManager.cc	2011-04-21 18:29:30 UTC (rev 8288)
@@ -110,7 +110,9 @@
             this->windowHeight_  = pRenderWindow->getHeight();
 
             // 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
             this->renderTarget_ = this->tempTexture_->getBuffer()->getRenderTarget();

Modified: code/branches/kicklib2/src/modules/designtools/SkyboxGenerator.cc
===================================================================
--- code/branches/kicklib2/src/modules/designtools/SkyboxGenerator.cc	2011-04-21 18:22:36 UTC (rev 8287)
+++ code/branches/kicklib2/src/modules/designtools/SkyboxGenerator.cc	2011-04-21 18:29:30 UTC (rev 8288)
@@ -171,7 +171,7 @@
                 // Setup the render window.
                 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;
                 
@@ -206,7 +206,7 @@
                 // Restore the render window.
                 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.
                 this->bGenerateSkybox_ = false;
@@ -309,7 +309,7 @@
         // Loading the resizing, then saving again. This seems stupid, but resizing doesn't seem to work otherwise.
         // 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);
         delete image;