Changeset 6866 for code/branches/fps/src/orxonox/controllers

Timestamp:

May 10, 2010, 12:40:49 PM (15 years ago)

Author:

freicy

Message:

commit by cyrill

Location:

code/branches/fps/src/orxonox/controllers

Files:

• HumanController.cc (modified) (1 diff)
• NewHumanController.cc (modified) (3 diffs)

code/branches/fps/src/orxonox/controllers/HumanController.cc

@@ -41 +41 @@
 namespace orxonox
 {
+    
     SetConsoleCommand(HumanController, moveFrontBack, true).setAsInputCommand();
     SetConsoleCommand(HumanController, moveRightLeft, true).setAsInputCommand();

code/branches/fps/src/orxonox/controllers/NewHumanController.cc

@@ -210 +210 @@
                 if (!controlPaused_ )
                 {
-                    if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
+                    if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket")) || this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer"))))
                         this->showOverlays();
 
@@ -425 +425 @@
             HumanController::yaw(value);
 
-        this->currentYaw_ = value.x;
+        if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
+            this->currentYaw_ = value.x;
     }
 
@@ -434 +435 @@
             HumanController::pitch(value);
 
-        this->currentPitch_ = value.x;
+        if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
+            this->currentPitch_ = value.x;
     }