Changeset 9273

Timestamp:

Jun 3, 2012, 9:25:48 PM (12 years ago)

Author:

landauf

Message:

reverted wrong skybox in teamDeathMatch.oxw
added try-catch to avoid a crash if the scene can't load the skybox

Location:

code/branches/presentation2012merge

Files:

• data/levels/teamDeathMatch.oxw (modified) (1 diff)
• src/orxonox/Scene.cc (modified) (1 diff)

code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw

@@ -25 +25 @@
   <Scene
    ambientlight = "0.7, 0.6, 0.6"
-   skybox       = "Orxonox/creeper1"
+   skybox       = "Orxonox/skypanoramagen1"
   >
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

code/branches/presentation2012merge/src/orxonox/Scene.cc

@@ -258 +258 @@
     void Scene::setSkybox(const std::string& skybox)
     {
-        if (GameMode::showsGraphics() && this->sceneManager_)
-            this->sceneManager_->setSkyBox(true, skybox);
+        try
+        {
+            if (GameMode::showsGraphics() && this->sceneManager_)
+                this->sceneManager_->setSkyBox(true, skybox);
+        }
+        catch (const Ogre::Exception&)
+        {
+            orxout(internal_error) << "Could not load skybox '" << skybox << "':" << endl;
+            orxout(internal_error) << Exception::handleMessage() << endl;
+        }
 
         this->skybox_ = skybox;