Changeset 2350 for code/branches/objecthierarchy2/src/orxonox/gamestates

Timestamp:

Dec 7, 2008, 4:18:11 AM (16 years ago)

Author:

landauf

Message:

• Added support for postprocessing shaders (bloom, motion blur, …). Shaders are only visible if Plugin_CgProgramManager is included in bin/Plugins.cfg.

• Added class GlobalShader which is visible on all clients and can be activated or deactivated by triggers or other events.

• Added RadialBlur shader to the SpaceShip's engine. The strength of the RadialBlur depends on the SpaceShip's velocity.

Location:

code/branches/objecthierarchy2/src/orxonox/gamestates

Files:

• GSGraphics.cc (modified) (3 diffs)
• GSLevel.cc (modified) (4 diffs)

code/branches/objecthierarchy2/src/orxonox/gamestates/GSGraphics.cc

@@ -31 +31 @@
 
 #include <fstream>
+#include <OgreCompositorManager.h>
 #include <OgreConfigFile.h>
 #include <OgreFrameListener.h>
@@ -188 +189 @@
         delete this->debugOverlay_;
 
+        // unload all compositors
+        Ogre::CompositorManager::getSingleton().removeAll();
+
         // destroy render window
         RenderSystem* renderer = this->ogreRoot_->getRenderSystem();
@@ -433 +437 @@
         // create a full screen default viewport
         this->viewport_ = this->renderWindow_->addViewport(0, 0);
+
+        if (this->graphicsEngine_)
+            this->graphicsEngine_->setViewport(this->viewport_);
     }
 

code/branches/objecthierarchy2/src/orxonox/gamestates/GSLevel.cc

@@ -65 +65 @@
     {
         RegisterObject(GSLevel);
+
+        this->ccKeybind_ = 0;
+        this->ccTkeybind_ = 0;
+        this->ccSetTimeFactor_ = 0;
+
         setConfigValues();
     }
@@ -142 +147 @@
     {
         // destroy console commands
-        delete this->ccKeybind_;
-        delete this->ccSetTimeFactor_;
-        delete this->ccTkeybind_;
+        if (this->ccKeybind_)
+        {
+            delete this->ccKeybind_;
+            this->ccKeybind_ = 0;
+        }
+        if (this->ccSetTimeFactor_)
+        {
+            delete this->ccSetTimeFactor_;
+            this->ccSetTimeFactor_ = 0;
+        }
+        if (this->ccTkeybind_)
+        {
+            delete this->ccTkeybind_;
+            this->ccTkeybind_ = 0;
+        }
 
         // this call will delete every BaseObject!
@@ -159 +176 @@
 
         if (this->radar_)
+        {
             delete this->radar_;
+            this->radar_ = 0;
+        }
 
         if (this->cameraManager_)
+        {
             delete this->cameraManager_;
+            this->cameraManager_ = 0;
+        }
 
         if (this->levelManager_)
+        {
             delete this->levelManager_;
+            this->levelManager_ = 0;
+        }
 
         if (this->playerManager_)
+        {
             delete this->playerManager_;
+            this->playerManager_ = 0;
+        }
 
         if (Core::showsGraphics())
@@ -175 +204 @@
             InputManager::getInstance().requestDestroyState("game");
             if (this->keyBinder_)
+            {
                 delete this->keyBinder_;
+                this->keyBinder_ = 0;
+            }
         }
     }