[Orxonox-commit 2088] r6804 - code/branches/skybox2/src/modules/designtools

[gionc at orxonox.net]

Author: gionc
Date: 2010-04-29 14:21:57 +0200 (Thu, 29 Apr 2010)
New Revision: 6804

Modified:
   code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc
   code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h
Log:
updated skyboxgenerator

Modified: code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc
===================================================================
--- code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc	2010-04-29 12:10:18 UTC (rev 6803)
+++ code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc	2010-04-29 12:21:57 UTC (rev 6804)
@@ -85,6 +85,8 @@
             {
             case 0 :
                 camera->getOgreCamera()->setFOVy(Degree(90));
+                aspectRatio_ = camera->getOgreCamera()->getAspectRatio();
+                fovy_ = camera->getOgreCamera()->getFOVy();
                 camera->getOgreCamera()->setAspectRatio(1);
                 iterateOverDirections_++;
                 break;
@@ -132,8 +134,8 @@
                 break;
                 
             case 7 :
-                camera->getOgreCamera()->setAspectRatio(1.3333);
-                camera->getOgreCamera()->setFOVy(Degree(45));
+                camera->getOgreCamera()->setAspectRatio(aspectRatio_);
+                camera->getOgreCamera()->setFOVy(fovy_);
                 iterateOverDirections_ =0;
                 takeScreenshot_ = false;
                 CommandExecutor::execute("pause");

Modified: code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h
===================================================================
--- code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h	2010-04-29 12:10:18 UTC (rev 6803)
+++ code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h	2010-04-29 12:21:57 UTC (rev 6804)
@@ -30,6 +30,7 @@
 #include "core/OrxonoxClass.h"
 #include "util/Singleton.h"
 #include "tools/interfaces/Tickable.h"
+#include <OgreMath.h>
  
  
 namespace orxonox
@@ -50,5 +51,7 @@
             std::string skyboxPrefix_; 
             bool takeScreenshot_;
             int iterateOverDirections_;
+            float aspectRatio_;
+            Ogre::Radian fovy_;
     };
 }