Changeset 6087 for code/branches/particles2/src/orxonox/infos/PlayerInfo.cc

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

File:

• code/branches/particles2/src/orxonox/infos/PlayerInfo.cc (modified) (7 diffs)

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)
         {