Changeset 6115 for code/branches/presentation2/src/orxonox

Timestamp:

Nov 21, 2009, 12:11:25 PM (15 years ago)

Author:

scheusso

Message:

mouselook now also working when steering a rocket

Location:

code/branches/presentation2/src/orxonox/controllers

Files:

• NewHumanController.cc (modified) (1 diff)
• NewHumanController.h (modified) (2 diffs)

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

@@ -235 +235 @@
             NewHumanController::localController_s->controlMode_ = 0;
     }
+    
+    void NewHumanController::changedControllableEntity()
+    {
+        this->controlMode_ = 0;
+        this->currentYaw_ = 0;
+        this->currentPitch_ = 0;
+    }
 }

code/branches/presentation2/src/orxonox/controllers/NewHumanController.h

@@ -51 +51 @@
 
             static void changeMode();
+            
+            virtual void changedControllableEntity();
 
         protected:
@@ -56 +58 @@
             
             unsigned int                controlMode_;
-            static NewHumanController* localController_s;
+            static NewHumanController*  localController_s;
         private:
             float                       currentYaw_;
             float                       currentPitch_;
             OrxonoxOverlay*             crossHairOverlay_;
-            float                                   overlaySize_;
+            float                       overlaySize_;
             ClassTreeMask               targetMask_;
     };