[Orxonox-commit 4602] r9273 - in code/branches/presentation2012merge: data/levels src/orxonox

[landauf at orxonox.net]

Author: landauf
Date: 2012-06-03 21:25:48 +0200 (Sun, 03 Jun 2012)
New Revision: 9273

Modified:
   code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw
   code/branches/presentation2012merge/src/orxonox/Scene.cc
Log:
reverted wrong skybox in teamDeathMatch.oxw
added try-catch to avoid a crash if the scene can't load the skybox

Modified: code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw
===================================================================
--- code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw	2012-06-03 16:05:24 UTC (rev 9272)
+++ code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw	2012-06-03 19:25:48 UTC (rev 9273)
@@ -24,7 +24,7 @@
 
   <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" />
 

Modified: code/branches/presentation2012merge/src/orxonox/Scene.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/Scene.cc	2012-06-03 16:05:24 UTC (rev 9272)
+++ code/branches/presentation2012merge/src/orxonox/Scene.cc	2012-06-03 19:25:48 UTC (rev 9273)
@@ -257,8 +257,16 @@
 
     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;
     }