Changeset 6087

Timestamp:

Nov 18, 2009, 1:34:14 PM (14 years ago)

Author:

scheusso

Message:

changes in PlayerInfo and Rocket (and scene)
not yet working in network though

Location:

code/branches/particles2/src

Files:

• modules/weapons/projectiles/Rocket.cc (modified) (6 diffs)
• modules/weapons/projectiles/Rocket.h (modified) (2 diffs)
• orxonox/Scene.cc (modified) (1 diff)
• orxonox/controllers/AIController.cc (modified) (1 diff)
• orxonox/infos/PlayerInfo.cc (modified) (7 diffs)
• orxonox/infos/PlayerInfo.h (modified) (2 diffs)

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

@@ -52 +52 @@
         RegisterObject(Rocket);// - register the Rocket class to the core
         
-        this->setCollisionType(WorldEntity::Kinematic);
-        this->setVelocity(0,0,-100);
-        this->model_ = new Model(this);
-        this->model_->setMeshSource("rocket_test.mesh");
-        this->attach(this->model_);
-        this->lifetime_ = 100;
-        this->bDestroy_ = false;
-        
         if (GameMode::isMaster())
         {
+            this->setCollisionType(WorldEntity::Kinematic);
+            this->setVelocity(0,0,-100);
+            this->lifetime_ = 100;
+            this->bDestroy_ = false;
+        
+            this->model_ = new Model(this);
+            this->model_->setMeshSource("rocket_test.mesh");
+            this->attach(this->model_);
+        
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
@@ -76 +77 @@
         this->camPosition_ = new CameraPosition(this);
         this->camPosition_->setPosition(0,10,40);
+        this->camPosition_->setSyncMode(0x0);
         this->attach( this->camPosition_ );
         this->addCameraPosition( this->camPosition_ );
@@ -88 +90 @@
         if(this->isInitialized())
         {
-            this->collisionShape_->destroy();
-            this->model_->destroy();
             
-            if (GameMode::isMaster() && this->player_)
+            if (GameMode::isMaster() && this->player_.get())
+            {
+                this->model_->destroy();
+                this->collisionShape_->destroy();
                 this->player_->stopTemporaryControl();
+            }
             this->camPosition_->destroy();
         }
@@ -110 +114 @@
     {
         this->owner_ = owner;
-        
         this->originalControllableEntity_ = this->owner_->getPlayer()->getControllableEntity();
         this->player_ = this->owner_->getPlayer();
@@ -126 +129 @@
         SUPER(Rocket, tick, dt);
         
-        this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
-        this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
-        this->localAngularVelocity_ = 0;
-        
-        if( this->bDestroy_ )
-            this->destroy();
+        if( GameMode::isMaster() )
+        {
+            this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
+            this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
+            this->localAngularVelocity_ = 0;
+            
+            if( this->bDestroy_ )
+                this->destroy();
+        }
     }
     
@@ -180 +186 @@
             this->destroy();
     }
+    
+    void Rocket::fire(unsigned int firemode)
+    {
+        if (this->owner_)
+        {
+            {
+                ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+                effect->setPosition(this->getPosition());
+                effect->setOrientation(this->getOrientation());
+                effect->setDestroyAfterLife(true);
+                effect->setSource("Orxonox/explosion3");
+                effect->setLifetime(2.0f);
+            }
+            {
+                ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+                effect->setPosition(this->getPosition());
+                effect->setOrientation(this->getOrientation());
+                effect->setDestroyAfterLife(true);
+                effect->setSource("Orxonox/smoke4");
+                effect->setLifetime(3.0f);
+            }
+            this->destroy();
+        }
+    }
 
     /**

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

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

code/branches/particles2/src/orxonox/Scene.cc

@@ -334 +334 @@
     {
         // get the WorldEntity pointers
-        WorldEntity* object0 = static_cast<WorldEntity*>(colObj0->getUserPointer());
-        assert(orxonox_cast<WorldEntity*>(object0));
-        WorldEntity* object1 = static_cast<WorldEntity*>(colObj1->getUserPointer());
-        assert(orxonox_cast<WorldEntity*>(object1));
+        SmartPtr<WorldEntity> object0 = static_cast<WorldEntity*>(colObj0->getUserPointer());
+        SmartPtr<WorldEntity> object1 = static_cast<WorldEntity*>(colObj1->getUserPointer());
 
         // false means that bullet will assume we didn't modify the contact

code/branches/particles2/src/orxonox/controllers/AIController.cc

@@ -109 +109 @@
 
         if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(Ogre::Math::PI / 20.0f))
-            this->getControllableEntity()->fire(0);
+//             this->getControllableEntity()->fire(0);
 
         SUPER(AIController, tick, dt);

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

@@ -50 +50 @@
         this->controller_ = 0;
         this->controllableEntity_ = 0;
-        this->controllableEntityID_ = CLIENTID_UNKNOWN;
+        this->controllableEntityID_ = OBJECTID_UNKNOWN;
+        this->temporaryControllableEntity_ = 0;
+        this->temporaryControllableEntityID_ = OBJECTID_UNKNOWN;
 
         this->gtinfo_ = 0;
@@ -80 +82 @@
         registerVariable(this->name_,                 VariableDirection::ToClient, new NetworkCallback<PlayerInfo>(this, &PlayerInfo::changedName));
         registerVariable(this->controllableEntityID_, VariableDirection::ToClient, new NetworkCallback<PlayerInfo>(this, &PlayerInfo::networkcallback_changedcontrollableentityID));
+        registerVariable(this->temporaryControllableEntityID_, VariableDirection::ToClient, new NetworkCallback<PlayerInfo>(this, &PlayerInfo::networkcallback_changedcontrollableentityID));
         registerVariable(this->bReadyToSpawn_,        VariableDirection::ToServer);
         registerVariable(this->gtinfoID_,             VariableDirection::ToClient, new NetworkCallback<PlayerInfo>(this, &PlayerInfo::networkcallback_changedgtinfoID));
@@ -166 +169 @@
     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();
+        if (!entity)
+            return;
+        
+        assert( this->temporaryControllableEntity_==0 );
+
+        this->temporaryControllableEntity_ = entity;
+        this->temporaryControllableEntityID_ = entity->getObjectID();
 
         entity->setPlayer(this);
@@ -201 +201 @@
 
         entity->removePlayer();
-        
-        if ( this->oldControllableEntity_ )
-        {
-            this->oldControllableEntity_->removePlayer();
-            this->oldControllableEntity_ = 0;
-        }
 
         this->changedControllableEntity();
@@ -213 +207 @@
     void PlayerInfo::stopTemporaryControl()
     {
-        ControllableEntity* entity = this->controllableEntity_;
+        ControllableEntity* entity = this->temporaryControllableEntity_;
 
         if (!entity)
             return;
 
-        this->controllableEntity_ = this->oldControllableEntity_.get();
-        this->controllableEntityID_ = this->controllableEntity_->getObjectID();
-
-        if (this->controller_)
+        this->temporaryControllableEntity_ = 0;
+        this->temporaryControllableEntityID_ = OBJECTID_UNKNOWN;
+
+        if ( this->controllableEntity_ && this->controller_)
             this->controller_->setControllableEntity(this->controllableEntity_);
 
@@ -228 +222 @@
         this->changedControllableEntity();
     }
-
+    
     void PlayerInfo::networkcallback_changedcontrollableentityID()
     {
@@ -243 +237 @@
     }
 
+    void PlayerInfo::networkcallback_changedtemporarycontrollableentityID()
+    {
+        CCOUT(0) << "changedtemporarycontrollableentityid" << endl;
+        if (this->temporaryControllableEntityID_ != OBJECTID_UNKNOWN)
+        {
+            Synchronisable* temp = Synchronisable::getSynchronisable(this->temporaryControllableEntityID_);
+            ControllableEntity* entity = orxonox_cast<ControllableEntity*>(temp);
+            this->startTemporaryControl(entity);
+        }
+        else
+        {
+            this->stopTemporaryControl();
+        }
+    }
+
+
     void PlayerInfo::networkcallback_changedgtinfoID()
     {
+        CCOUT(0) << "changedcontrollableentityid" << endl;
         if (this->gtinfoID_ != OBJECTID_UNKNOWN)
         {

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

@@ -92 +92 @@
         private:
             void networkcallback_changedcontrollableentityID();
+            void networkcallback_changedtemporarycontrollableentityID();
             void networkcallback_changedgtinfoID();
             void updateGametypeInfo();
@@ -98 +99 @@
             Controller* controller_;
             ControllableEntity* controllableEntity_;
-            WeakPtr<ControllableEntity> oldControllableEntity_;
+            ControllableEntity* temporaryControllableEntity_;
             unsigned int controllableEntityID_;
+            unsigned int temporaryControllableEntityID_;
 
             const GametypeInfo* gtinfo_;