Changeset 6115 for code/branches/presentation2

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

Files:

• modules/weapons/projectiles/Rocket.cc (modified) (7 diffs)
• orxonox/controllers/NewHumanController.cc (modified) (1 diff)
• orxonox/controllers/NewHumanController.h (modified) (2 diffs)

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc

@@ -63 +63 @@
             this->model_ = new Model(this);
             this->model_->setMeshSource("rocket.mesh");
-                        this->attach(this->model_);
-                        ParticleSpawner* fire = new ParticleSpawner(this);
-                        this->attach(fire);
-                        fire->setOrientation(this->getOrientation());
+            this->attach(this->model_);
+            ParticleSpawner* fire = new ParticleSpawner(this);
+            this->attach(fire);
+            fire->setOrientation(this->getOrientation());
             fire->setSource("Orxonox/rocketfire");
         
@@ -79 +79 @@
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Rocket::destroyObject, this)));
-               
-                        
         }
         
@@ -86 +84 @@
         this->camPosition_->setPosition(0,10,40);
         this->camPosition_->setSyncMode(0x0);
+        this->camPosition_->setAllowMouseLook(true);
         this->attach( this->camPosition_ );
         this->addCameraPosition( this->camPosition_ );
@@ -98 +97 @@
         if(this->isInitialized())
         {
-            
             if (GameMode::isMaster() && this->player_.get())
             {
@@ -229 +227 @@
     void Rocket::rotateYaw(const Vector2& value)
     {
-        this->localAngularVelocity_.y += value.x;
+        ControllableEntity::rotateYaw(value);
+        
+        if( !this->isInMouseLook() )
+            this->localAngularVelocity_.y += value.x;
     }
 
@@ -240 +241 @@
     void Rocket::rotatePitch(const Vector2& value)
     {
-        this->localAngularVelocity_.x += value.x;
+        ControllableEntity::rotatePitch(value);
+        
+        if( !this->isInMouseLook() )
+            this->localAngularVelocity_.x += value.x;
     }
 
@@ -251 +255 @@
     void Rocket::rotateRoll(const Vector2& value)
     {
-        this->localAngularVelocity_.z += value.x;
+        ControllableEntity::rotateRoll(value);
+        
+        if( !this->isInMouseLook() )
+            this->localAngularVelocity_.z += value.x;
     }
     

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_;
     };