Changeset 2478 for code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns

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/worldentities/pawns

Files:

• SpaceShip.cc (modified) (4 diffs)
• Spectator.cc (modified) (6 diffs)
• Spectator.h (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

@@ -134 +134 @@
         if (this->hasLocalController())
         {
-            this->yaw(this->yawRotation_ * dt);
-            if (this->bInvertYAxis_)
-                this->pitch(Degree(-this->pitchRotation_ * dt));
-            else
-                this->pitch(Degree( this->pitchRotation_ * dt));
-            this->roll(this->rollRotation_ * dt);
+            if (!this->isInMouseLook())
+            {
+                this->yaw(this->yawRotation_ * dt);
+                if (this->bInvertYAxis_)
+                    this->pitch(Degree(-this->pitchRotation_ * dt));
+                else
+                    this->pitch(Degree( this->pitchRotation_ * dt));
+                this->roll(this->rollRotation_ * dt);
+            }
 
             this->yawRotation_   = this->zeroDegree_;
@@ -170 +173 @@
             temp = -this->maxRotation_;
         this->yawRotation_ = Degree(temp);
+
+        Pawn::rotateYaw(value);
     }
 
@@ -180 +185 @@
             temp = -this->maxRotation_;
         this->pitchRotation_ = Degree(temp);
+
+        Pawn::rotatePitch(value);
     }
 
@@ -190 +197 @@
             temp = -this->maxRotation_;
         this->rollRotation_ = Degree(temp);
+
+        Pawn::rotateRoll(value);
     }
 

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Spectator.cc

@@ -51 +51 @@
 
         this->speed_ = 200;
-        this->rotationSpeed_ = 3;
 
         this->yaw_ = 0;
@@ -88 +87 @@
     {
         SetConfigValue(speed_, 200.0f);
-        SetConfigValue(rotationSpeed_, 3.0f);
     }
 
@@ -116 +114 @@
             this->setVelocity(velocity * this->speed_);
 
-            this->yaw(Radian(this->yaw_ * this->rotationSpeed_));
-            this->pitch(Radian(this->pitch_ * this->rotationSpeed_));
-            this->roll(Radian(this->roll_ * this->rotationSpeed_));
+            if (!this->isInMouseLook())
+            {
+                this->yaw(Radian(this->yaw_ * this->getMouseLookSpeed()));
+                this->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                this->roll(Radian(this->roll_ * this->getMouseLookSpeed()));
+            }
 
             this->yaw_ = this->pitch_ = this->roll_ = 0;
@@ -161 +162 @@
     {
         this->yaw_ = value.y;
+
+        ControllableEntity::rotateYaw(value);
     }
 
@@ -166 +169 @@
     {
         this->pitch_ = value.y;
+
+        ControllableEntity::rotatePitch(value);
     }
 
@@ -171 +176 @@
     {
         this->roll_ = value.y;
+
+        ControllableEntity::rotateRoll(value);
     }
 

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Spectator.h

@@ -69 +69 @@
 
             float speed_;
-            float rotationSpeed_;
 
             float yaw_;