Changeset 2478 for code/branches/objecthierarchy2/src/orxonox/objects/items

Timestamp:

Dec 15, 2008, 11:26:16 PM (16 years ago)

Author:

landauf

Message:

• Readded smooth camera movement (configurable through CameraPosition), works also with camera-position-changes
• Added free mouse look (press left control key)
• Made strength of boost-blur configurable

Location:

code/branches/objecthierarchy2/src/orxonox/objects/items

Files:

• Engine.cc (modified) (4 diffs)
• Engine.h (modified) (2 diffs)

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

@@ -31 +31 @@
 
 #include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
@@ -63 +64 @@
         this->boostBlur_ = 0;
 
+        this->setConfigValues();
         this->registerVariables();
     }
@@ -95 +97 @@
     }
 
+    void Engine::setConfigValues()
+    {
+        SetConfigValue(blurStrength_, 3.0f);
+    }
+
     void Engine::registerVariables()
     {
@@ -197 +204 @@
 
         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));
+            this->boostBlur_->setParameter("Ogre/Compositor/Radial_Blur", 0, 0, "sampleStrength", this->blurStrength_ * clamp((-velocity.z - this->maxSpeedFront_) / ((this->boostFactor_ - 1) * this->maxSpeedFront_), 0.0f, 1.0f));
     }
 

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

@@ -46 +46 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             void registerVariables();
+            void setConfigValues();
 
             virtual void tick(float dt);
@@ -127 +128 @@
 
             Shader* boostBlur_;
+            float blurStrength_;
     };
 }