Changeset 6082 for code/branches

Timestamp:

Nov 17, 2009, 10:57:44 PM (15 years ago)

Author:

scheusso

Message:

some fixes in Rocket
there are two new function ins PlayerInfo: startTemporaryControl and stopTemporaryControl which expand start/stop-Control but without removing the player from the currently controlled controllable entity

Location:

code/branches/particles2/src

Files:

• modules/weapons/projectiles/Rocket.cc (modified) (10 diffs)
• modules/weapons/projectiles/Rocket.h (modified) (2 diffs)
• orxonox/infos/PlayerInfo.cc (modified) (2 diffs)
• orxonox/infos/PlayerInfo.h (modified) (2 diffs)

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

@@ -55 +55 @@
         this->setVelocity(0,0,-100);
         this->model_ = new Model(this);
-        this->model_->setMeshSource("can.mesh");
+        this->model_->setMeshSource("rocket_test.mesh");
         this->attach(this->model_);
         this->lifetime_ = 100;
+        this->bDestroy_ = false;
         
         if (GameMode::isMaster())
@@ -74 +75 @@
         
         this->camPosition_ = new CameraPosition(this);
-        this->camPosition_->setPosition(0,0,0);
+        this->camPosition_->setPosition(0,10,40);
         this->attach( this->camPosition_ );
         this->addCameraPosition( this->camPosition_ );
@@ -90 +91 @@
             this->model_->destroy();
             
-            if (GameMode::isMaster() && this->owner_)
-                this->owner_->getPlayer()->startControl(this->originalControllableEntity_);
+            if (GameMode::isMaster() && this->player_)
+                this->player_->stopTemporaryControl();
             this->camPosition_->destroy();
         }
@@ -109 +110 @@
     {
         this->owner_ = owner;
-            
+        
         this->originalControllableEntity_ = this->owner_->getPlayer()->getControllableEntity();
-        this->originalControllableEntity_->setDestroyWhenPlayerLeft( false );
-        this->owner_->getPlayer()->startControl(this);
+        this->player_ = this->owner_->getPlayer();
+        this->owner_->getPlayer()->startTemporaryControl(this);
     }
 
@@ -126 +127 @@
         
         this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
-        this->setVelocity( (this->getOrientation()*WorldEntity::FRONT)*100 );
+        this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
         this->localAngularVelocity_ = 0;
-//         this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxilaryThrust_);
-//         this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() * getMass() * this->auxilaryThrust_);
-//         if (this->localLinearAcceleration_.z() > 0)
-//             this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->auxilaryThrust_);
-//         else
-//             this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->primaryThrust_);
-//         this->physicalBody_->applyCentralForce(physicalBody_->getWorldTransform().getBasis() * this->localLinearAcceleration_);
-//         this->localLinearAcceleration_.setValue(0, 0, 0);
-//     
-//         this->localAngularAcceleration_ *= this->getLocalInertia() * this->rotationThrust_;
-//         this->physicalBody_->applyTorque(physicalBody_->getWorldTransform().getBasis() * this->localAngularAcceleration_);
+        
+        if( this->bDestroy_ )
+            this->destroy();
     }
     
@@ -147 +140 @@
             if (otherObject == this->owner_)
                 return false;
-
+            
             this->bDestroy_ = true;
 
@@ -177 +170 @@
             if (victim)
                 victim->damage(dmg, this->owner_);
+//             this->destroy();
         }
         return false;
@@ -195 +189 @@
     void Rocket::rotateYaw(const Vector2& value)
     {
-        this->localAngularVelocity_.y = value.x;
+        this->localAngularVelocity_.y += value.x;
     }
 
@@ -206 +200 @@
     void Rocket::rotatePitch(const Vector2& value)
     {
-        this->localAngularVelocity_.x = value.x;
+        this->localAngularVelocity_.x += value.x;
     }
 
@@ -217 +211 @@
     void Rocket::rotateRoll(const Vector2& value)
     {
-        this->localAngularVelocity_.z = value.x;
+        this->localAngularVelocity_.z += value.x;
     }
     

code/branches/particles2/src/modules/weapons/projectiles/Rocket.h

@@ -110 +110 @@
             inline float getDamage() const
                 { return this->damage_; }
-            virtual void fire(unsigned int firemode) {}
+            virtual void fire(unsigned int firemode) { this->destroy(); }
             
         private:
@@ -122 +122 @@
             CameraPosition* camPosition_;
             ConeCollisionShape* collisionShape_;
+            PlayerInfo* player_;
             Timer destroyTimer_;
             float lifetime_;

code/branches/particles2/src/orxonox/infos/PlayerInfo.cc

@@ -163 +163 @@
         this->changedControllableEntity();
     }
+    
+    void PlayerInfo::startTemporaryControl(ControllableEntity* entity)
+    {
+        if (!entity || entity == this->controllableEntity_)
+            return;
+
+//         if (this->controllableEntity_)
+//             this->stopControl();
+
+        this->oldControllableEntity_ = this->controllableEntity_;
+
+        this->controllableEntity_ = entity;
+        this->controllableEntityID_ = entity->getObjectID();
+
+        entity->setPlayer(this);
+
+        this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
+
+        if (this->controller_)
+            this->controller_->setControllableEntity(entity);
+
+        this->changedControllableEntity();
+    }
 
     void PlayerInfo::stopControl()
@@ -178 +201 @@
 
         entity->removePlayer();
-
+        
+        if ( this->oldControllableEntity_ )
+        {
+            this->oldControllableEntity_->removePlayer();
+            this->oldControllableEntity_ = 0;
+        }
+
+        this->changedControllableEntity();
+    }
+    
+    void PlayerInfo::stopTemporaryControl()
+    {
+        ControllableEntity* entity = this->controllableEntity_;
+
+        if (!entity)
+            return;
+
+        this->controllableEntity_ = this->oldControllableEntity_.get();
+        this->controllableEntityID_ = this->controllableEntity_->getObjectID();
+
+        if (this->controller_)
+            this->controller_->setControllableEntity(this->controllableEntity_);
+
+        entity->removePlayer();
+        
         this->changedControllableEntity();
     }

code/branches/particles2/src/orxonox/infos/PlayerInfo.h

@@ -69 +69 @@
             void startControl(ControllableEntity* entity);
             void stopControl();
+            void startTemporaryControl(ControllableEntity* entity);
+            void stopTemporaryControl();
 
             inline ControllableEntity* getControllableEntity() const
@@ -96 +98 @@
             Controller* controller_;
             ControllableEntity* controllableEntity_;
+            WeakPtr<ControllableEntity> oldControllableEntity_;
             unsigned int controllableEntityID_;