Changeset 2350 for code/branches/objecthierarchy2/src

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

Files:

• GraphicsEngine.cc (modified) (1 diff)
• GraphicsEngine.h (modified) (1 diff)
• OrxonoxPrereqs.h (modified) (2 diffs)
• gamestates/GSGraphics.cc (modified) (3 diffs)
• gamestates/GSLevel.cc (modified) (4 diffs)
• objects/CMakeLists.txt (modified) (1 diff)
• objects/GlobalShader.cc (added)
• objects/GlobalShader.h (added)
• objects/items/Engine.cc (modified) (5 diffs)
• objects/items/Engine.h (modified) (2 diffs)
• objects/worldentities/Backlight.cc (modified) (2 diffs)
• objects/worldentities/Camera.cc (modified) (4 diffs)
• tools/CMakeLists.txt (modified) (1 diff)
• tools/Shader.cc (added)
• tools/Shader.h (added)

code/branches/objecthierarchy2/src/orxonox/GraphicsEngine.cc

@@ -77 +77 @@
         singletonRef_s = this;
 
+        this->viewport_ = 0;
+
         this->detailLevelParticle_ = 0;
 

code/branches/objecthierarchy2/src/orxonox/GraphicsEngine.h

@@ -72 +72 @@
         static GraphicsEngine* getInstancePtr() { return singletonRef_s; }
 
+        inline void setViewport(Ogre::Viewport* viewport)
+            { this->viewport_ = viewport; }
+        inline Ogre::Viewport* getViewport() const
+            { return this->viewport_; }
+
     private:
         // don't mess with singletons
         GraphicsEngine(GraphicsEngine&);
+
+        Ogre::Viewport*     viewport_;              //!< default full size viewport
 
         // stats

code/branches/objecthierarchy2/src/orxonox/OrxonoxPrereqs.h

@@ -114 +114 @@
     class BlinkingBillboard;
     class FadingBillboard;
+    class GlobalShader;
     class Light;
     class Backlight;
@@ -162 +163 @@
     class Mesh;
     class ParticleInterface;
+    class Shader;
     template <class T>
     class Timer;

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;
+            }
         }
     }

code/branches/objecthierarchy2/src/orxonox/objects/CMakeLists.txt

@@ -3 +3 @@
   EventDispatcher.cc
   EventTarget.cc
+  GlobalShader.cc
   Level.cc
   Radar.cc

code/branches/objecthierarchy2/src/orxonox/objects/items/Engine.cc

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "objects/Scene.h"
 #include "objects/worldentities/pawns/SpaceShip.h"
+#include "tools/Shader.h"
 
 namespace orxonox
@@ -59 +61 @@
         this->accelerationUpDown_ = 0.0;
 
+        this->boostBlur_ = 0;
+
         this->registerVariables();
     }
@@ -65 +69 @@
     {
         if (this->isInitialized() && this->ship_)
+        {
             this->ship_->setEngine(0);
+
+            if (this->boostBlur_)
+                delete this->boostBlur_;
+        }
     }
 
@@ -178 +187 @@
         this->ship_->setBoost(false);
         this->ship_->setSteeringDirection(Vector3::ZERO);
+
+        if (!this->boostBlur_ && this->ship_->hasLocalController() && this->ship_->hasHumanController())
+        {
+            this->boostBlur_ = new Shader(this->ship_->getScene()->getSceneManager());
+            this->boostBlur_->setCompositor("Radial Blur");
+        }
+
+        if (this->boostBlur_ && this->maxSpeedFront_ != 0 && this->boostFactor_ != 1)
+            this->boostBlur_->setParameter("Ogre/Compositor/Radial_Blur", 0, 0, "sampleStrength", 5.0f * clamp((-velocity.z - this->maxSpeedFront_) / ((this->boostFactor_ - 1) * this->maxSpeedFront_), 0.0f, 1.0f));
+    }
+
+    void Engine::changedActivity()
+    {
+        SUPER(Engine, changedActivity);
+
+        if (this->boostBlur_)
+            this->boostBlur_->setVisible(this->isVisible());
     }
 
@@ -188 +214 @@
             if (ship->getEngine() != this)
                 ship->setEngine(this);
+
+            if (this->boostBlur_)
+            {
+                delete this->boostBlur_;
+                this->boostBlur_ = 0;
+            }
         }
     }

code/branches/objecthierarchy2/src/orxonox/objects/items/Engine.h

@@ -48 +48 @@
 
             virtual void tick(float dt);
+            virtual void changedActivity();
 
             virtual void addToSpaceShip(SpaceShip* ship);
@@ -124 +125 @@
             float accelerationLeftRight_;
             float accelerationUpDown_;
+
+            Shader* boostBlur_;
     };
 }

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.cc

@@ -38 +38 @@
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
+#include "util/Exception.h"
 
 namespace orxonox
@@ -59 +60 @@
         if (Core::showsGraphics())
         {
-            assert(this->getScene());
-            assert(this->getScene()->getSceneManager());
-            assert(this->getScene()->getRootSceneNode());
+            if (!this->getScene())
+                ThrowException(AbortLoading, "Can't create Camera, no scene given.");
+            if (!this->getScene()->getSceneManager())
+                ThrowException(AbortLoading, "Can't create Camera, no scene manager given.");
+            if (!this->getScene()->getRootSceneNode())
+                ThrowException(AbortLoading, "Can't create Camera, no root scene node given.");
 
             this->ribbonTrail_ = this->getScene()->getSceneManager()->createRibbonTrail(this->getNode()->getName());

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc

@@ -37 +37 @@
 #include <OgreSceneNode.h>
 #include <OgreViewport.h>
+#include <OgreCompositorManager.h>
+#include <OgreResource.h>
 
 #include "util/Exception.h"
@@ -42 +44 @@
 #include "core/ConfigValueIncludes.h"
 #include "objects/Scene.h"
+#include "tools/Shader.h"
 #include "CameraManager.h"
 
@@ -75 +78 @@
         {
             this->releaseFocus();
+            this->getScene()->getSceneManager()->destroyCamera(this->camera_);
         }
     }
@@ -122 +126 @@
     void Camera::setFocus(Ogre::Viewport* viewport)
     {
+        // This workaround is needed to avoid weird behaviour with active compositors while
+        // switching the camera (like freezing the image)
+        //
+        // Last known Ogre version needing this workaround:
+        // 1.4.8
+
+        // deactivate all compositors
+        {
+            Ogre::ResourceManager::ResourceMapIterator iterator = Ogre::CompositorManager::getSingleton().getResourceIterator();
+            while (iterator.hasMoreElements())
+                Ogre::CompositorManager::getSingleton().setCompositorEnabled(viewport, iterator.getNext()->getName(), false);
+        }
+
         this->bHasFocus_ = true;
         viewport->setCamera(this->camera_);
+
+        // reactivate all visible compositors
+        {
+            for (ObjectList<Shader>::iterator it = ObjectList<Shader>::begin(); it != ObjectList<Shader>::end(); ++it)
+                it->updateVisibility();
+        }
     }
 }

code/branches/objecthierarchy2/src/orxonox/tools/CMakeLists.txt

@@ -3 +3 @@
   Mesh.cc
   ParticleInterface.cc
+  Shader.cc
   TextureGenerator.cc
   Timer.cc