Changeset 6101 for code/branches/particles2

Timestamp:

Nov 20, 2009, 1:02:09 AM (15 years ago)

Author:

scheusso

Message:

rocket now steerable also on client
AIController shoots again now
fire network function is now in CE instead of Pawn
some changes in PlayerInfo that allow controlling of temporary objects (such as Rocket)

Location:

code/branches/particles2/src

Files:

• modules/weapons/projectiles/Rocket.cc (modified) (2 diffs)
• modules/weapons/projectiles/Rocket.h (modified) (1 diff)
• orxonox/controllers/AIController.cc (modified) (1 diff)
• orxonox/controllers/HumanController.cc (modified) (1 diff)
• orxonox/infos/PlayerInfo.cc (modified) (8 diffs)
• orxonox/infos/PlayerInfo.h (modified) (2 diffs)
• orxonox/worldentities/ControllableEntity.cc (modified) (3 diffs)
• orxonox/worldentities/ControllableEntity.h (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)
• orxonox/worldentities/pawns/Spectator.cc (modified) (1 diff)
• orxonox/worldentities/pawns/Spectator.h (modified) (1 diff)

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

@@ -137 +137 @@
         SUPER(Rocket, tick, dt);
         
-        if( GameMode::isMaster() )
+        if( this->hasLocalController() )
         {
             this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
@@ -196 +196 @@
     }
     
-    void Rocket::fire(unsigned int firemode)
+    void Rocket::fired(unsigned int firemode)
     {
         if (this->owner_)

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 fired(unsigned int firemode);
             
         private:

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/controllers/HumanController.cc

@@ -145 +145 @@
     void HumanController::fire(unsigned int firemode)
     {
-        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+        if( HumanController::localController_s && HumanController::localController_s->controllableEntity_ )
             HumanController::localController_s->controllableEntity_->fire(firemode);
     }

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

@@ -51 +51 @@
         this->controllableEntity_ = 0;
         this->controllableEntityID_ = OBJECTID_UNKNOWN;
-        this->temporaryControllableEntity_ = 0;
-        this->temporaryControllableEntityID_ = OBJECTID_UNKNOWN;
+        this->oldControllableEntity_ = 0;
 
         this->gtinfo_ = 0;
@@ -82 +81 @@
         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));
     }
@@ -151 +148 @@
             return;
 
+        if (this->oldControllableEntity_)
+            this->stopTemporaryControl();
         if (this->controllableEntity_)
             this->stopControl();
@@ -172 +171 @@
             return;
         
-        assert( this->temporaryControllableEntity_==0 );
-
-        this->temporaryControllableEntity_ = entity;
-        this->temporaryControllableEntityID_ = entity->getObjectID();
+//         assert( this->temporaryControllableEntity_==0 );
+
+        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);
@@ -189 +187 @@
     void PlayerInfo::stopControl()
     {
+        if ( this->oldControllableEntity_ )
+            this->stopTemporaryControl();
+        
         ControllableEntity* entity = this->controllableEntity_;
 
@@ -200 +201 @@
             this->controller_->setControllableEntity(0);
 
-        entity->removePlayer();
+        if ( GameMode::isMaster() )
+            entity->removePlayer();
 
         this->changedControllableEntity();
@@ -207 +209 @@
     void PlayerInfo::stopTemporaryControl()
     {
-        ControllableEntity* entity = this->temporaryControllableEntity_;
-
-        if (!entity)
-            return;
-
-        this->temporaryControllableEntity_ = 0;
-        this->temporaryControllableEntityID_ = OBJECTID_UNKNOWN;
+        ControllableEntity* entity = this->controllableEntity_;
+
+        if (!entity || !this->oldControllableEntity_)
+            return;
+
+        this->controllableEntity_ = this->oldControllableEntity_;
+        this->controllableEntityID_ = this->controllableEntity_->getObjectID();
+        this->oldControllableEntity_ = 0;
 
         if ( this->controllableEntity_ && this->controller_)
             this->controller_->setControllableEntity(this->controllableEntity_);
 
-        entity->removePlayer();
+        if ( GameMode::isMaster() )
+            entity->removePlayer();
         
         this->changedControllableEntity();
@@ -237 +241 @@
     }
 
-    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();
@@ -99 +98 @@
             Controller* controller_;
             ControllableEntity* controllableEntity_;
-            ControllableEntity* temporaryControllableEntity_;
+            ControllableEntity* oldControllableEntity_;
             unsigned int controllableEntityID_;
-            unsigned int temporaryControllableEntityID_;
 
             const GametypeInfo* gtinfo_;

code/branches/particles2/src/orxonox/worldentities/ControllableEntity.cc

@@ -36 +36 @@
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
+#include "network/NetworkFunction.h"
 
 #include "Scene.h"
@@ -47 +48 @@
 {
     CreateFactory(ControllableEntity);
+
+    registerMemberNetworkFunction( ControllableEntity, fire );
 
     ControllableEntity::ControllableEntity(BaseObject* creator) : MobileEntity(creator)
@@ -217 +220 @@
             this->cameraPositionRootNode_->roll(Radian(value.y * this->mouseLookSpeed_), Ogre::Node::TS_LOCAL);
     }
+    
+    void ControllableEntity::fire(unsigned int firemode)
+    {
+        if(GameMode::isMaster())
+        {
+            this->fired(firemode);
+        }
+        else
+        {
+            callMemberNetworkFunction(ControllableEntity, fire, this->getObjectID(), 0, firemode);
+        }
+    }
 
     void ControllableEntity::setPlayer(PlayerInfo* player)

code/branches/particles2/src/orxonox/worldentities/ControllableEntity.h

@@ -84 +84 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            virtual void fire(unsigned int firemode) {}
+            void fire(unsigned int firemode);
+            virtual void fired(unsigned int firemode) {}
             virtual void reload() {}
 

code/branches/particles2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -52 +52 @@
     CreateFactory(Pawn);
 
-    registerMemberNetworkFunction( Pawn, doFire );
-
     Pawn::Pawn(BaseObject* creator) : ControllableEntity(creator)
     {
@@ -263 +261 @@
     }
 
-    void Pawn::fire(unsigned int firemode)
-    {
-        this->doFire(firemode);
-    }
-
-    void Pawn::doFire(uint8_t firemode)
-    {
-        if(GameMode::isMaster())
-        {
-            if (this->weaponSystem_)
-                this->weaponSystem_->fire(firemode);
-        }
-        else
-        {
-            callMemberNetworkFunction(Pawn, doFire, this->getObjectID(), 0, firemode);
-            if (this->weaponSystem_)
-                this->weaponSystem_->fire(firemode);
-        }
+    void Pawn::fired(unsigned int firemode)
+    {
+        if (this->weaponSystem_)
+            this->weaponSystem_->fire(firemode);
     }
 

code/branches/particles2/src/orxonox/worldentities/pawns/Pawn.h

@@ -79 +79 @@
             virtual void kill();
 
-            virtual void fire(unsigned int firemode);
+            virtual void fired(unsigned int firemode);
             virtual void reload();
-            virtual void doFire(uint8_t firemode);
             virtual void postSpawn();
 

code/branches/particles2/src/orxonox/worldentities/pawns/Spectator.cc

@@ -189 +189 @@
     }
 
-    void Spectator::fire(unsigned int firemode)
+    void Spectator::fired(unsigned int firemode)
     {
         if (this->getPlayer())

code/branches/particles2/src/orxonox/worldentities/pawns/Spectator.h

@@ -55 +55 @@
             virtual void rotateRoll(const Vector2& value);
 
-            virtual void fire(unsigned int firemode);
+            virtual void fired(unsigned int firemode);
             virtual void greet();