Changeset 2062 for code/branches/objecthierarchy/src/orxonox/objects/worldentities

Timestamp:

Oct 29, 2008, 5:19:02 PM (16 years ago)

Author:

scheusso

Message:

client→server synchronisation of controllable entities works now

File:

• code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (6 diffs)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -163 +163 @@
             if (!Core::isMaster())
             {
+                this->client_overwrite_ = this->server_overwrite_;
 COUT(0) << "CE: bidirectional synchronization" << std::endl;
                 this->setObjectMode(network::direction::bidirectional);
@@ -248 +249 @@
     {
         REGISTERSTRING(this->cameraPositionTemplate_, network::direction::toclient);
+        
+        
+        REGISTERDATA(this->client_overwrite_,   network::direction::toserver);
+        REGISTERDATA(this->server_overwrite_,   network::direction::toclient, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::processOverwrite));
 
         REGISTERDATA(this->server_position_,    network::direction::toclient, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerPosition));
@@ -253 +258 @@
         REGISTERDATA(this->server_orientation_, network::direction::toclient, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerOrientation));
 
-        REGISTERDATA(this->server_overwrite_,   network::direction::toclient, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::processOverwrite));
 
         REGISTERDATA(this->client_position_,    network::direction::toserver, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientPosition));
@@ -259 +263 @@
         REGISTERDATA(this->client_orientation_, network::direction::toserver, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientOrientation));
 
-        REGISTERDATA(this->client_overwrite_,   network::direction::toserver);
 
         REGISTERDATA(this->playerID_, network::direction::toclient, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::networkcallback_changedplayerID));
@@ -302 +305 @@
             this->server_position_ = this->client_position_;
         }
+        else
+          COUT(2) << "callback: not setting client position" << endl;
     }
 
@@ -453 +458 @@
         else if (this->bControlled_)
         {
-            this->node_->lookAt(target, relativeTo, localDirectionVector);
+//             this->node_->lookAt(target, relativeTo, localDirectionVector);
             this->client_orientation_ = this->node_->getOrientation();
         }