Changeset 2478 for code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc

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

File:

• code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (8 diffs)

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

@@ -30 +30 @@
 #include "ControllableEntity.h"
 
+#include <OgreSceneManager.h>
+
 #include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
 #include "core/Core.h"
 #include "core/XMLPort.h"
 #include "core/Template.h"
 
+#include "objects/Scene.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/worldentities/Camera.h"
@@ -59 +63 @@
         this->camera_ = 0;
         this->bDestroyWhenPlayerLeft_ = false;
+        this->cameraPositionRootNode_ = this->node_->createChildSceneNode();
+        this->bMouseLook_ = false;
+        this->mouseLookSpeed_ = 200;
 
         this->gtinfo_ = 0;
@@ -74 +81 @@
         this->client_orientation_ = Quaternion::IDENTITY;
 
+        this->setConfigValues();
         this->registerVariables();
     }
@@ -94 +102 @@
             if (this->camera_)
                 delete this->camera_;
+
+            for (std::list<CameraPosition*>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+                delete (*it);
+
+            if (this->getScene()->getSceneManager())
+                this->getScene()->getSceneManager()->destroySceneNode(this->cameraPositionRootNode_->getName());
         }
     }
@@ -107 +121 @@
     }
 
+    void ControllableEntity::setConfigValues()
+    {
+        SetConfigValue(mouseLookSpeed_, 3.0f);
+    }
+
     void ControllableEntity::changedGametype()
     {
@@ -124 +143 @@
     void ControllableEntity::addCameraPosition(CameraPosition* position)
     {
-        this->attach(position);
+        if (position->getAllowMouseLook())
+            position->attachToNode(this->cameraPositionRootNode_);
+        else
+            this->attach(position);
         this->cameraPositions_.push_back(position);
     }
@@ -165 +187 @@
             else
             {
-                this->attach(this->camera_);
-            }
-        }
+                this->camera_->attachToNode(this->cameraPositionRootNode_);
+            }
+        }
+    }
+
+    void ControllableEntity::mouseLook()
+    {
+        this->bMouseLook_ = !this->bMouseLook_;
+
+        if (!this->bMouseLook_)
+            this->cameraPositionRootNode_->setOrientation(Quaternion::IDENTITY);
+    }
+
+    void ControllableEntity::rotateYaw(const Vector2& value)
+    {
+        if (this->bMouseLook_)
+            this->cameraPositionRootNode_->yaw(Radian(value.y * this->mouseLookSpeed_), Ogre::Node::TS_LOCAL);
+    }
+
+    void ControllableEntity::rotatePitch(const Vector2& value)
+    {
+        if (this->bMouseLook_)
+            this->cameraPositionRootNode_->pitch(Radian(value.y * this->mouseLookSpeed_), Ogre::Node::TS_LOCAL);
+    }
+
+    void ControllableEntity::rotateRoll(const Vector2& value)
+    {
+        if (this->bMouseLook_)
+            this->cameraPositionRootNode_->roll(Radian(value.y * this->mouseLookSpeed_), Ogre::Node::TS_LOCAL);
     }
 
@@ -243 +291 @@
                 this->cameraPositions_.front()->attachCamera(this->camera_);
             else
-                this->attach(this->camera_);
+                this->camera_->attachToNode(this->cameraPositionRootNode_);
         }