Changeset 2474 for code/branches/presentation

Timestamp:

Dec 15, 2008, 11:02:18 PM (16 years ago)

Author:

rgrieder

Message:

A little tweak and physics seems to work over the network

File:

• code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (8 diffs)

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

@@ -276 +276 @@
     {
         if (!this->bControlled_)
-            this->setPosition(this->server_position_);
+            MobileEntity::setPosition(this->server_position_);
     }
 
@@ -282 +282 @@
     {
         if (!this->bControlled_)
-            this->setVelocity(this->server_linear_velocity_);
+            MobileEntity::setVelocity(this->server_linear_velocity_);
     }
 
@@ -288 +288 @@
     {
         if (!this->bControlled_)
-            this->setOrientation(this->server_orientation_);
+            MobileEntity::setOrientation(this->server_orientation_);
     }
 
@@ -294 +294 @@
     {
         if (!this->bControlled_)
-            this->setAngularVelocity(this->server_angular_velocity_);
+            MobileEntity::setAngularVelocity(this->server_angular_velocity_);
     }
 
@@ -314 +314 @@
         if (this->server_overwrite_ == this->client_overwrite_)
         {
-            this->setPosition(this->client_position_);
-            // The call above increments the overwrite. This is not desired to reduce traffic
-            --this->server_overwrite_;
+            MobileEntity::setPosition(this->client_position_);
+            this->server_position_ = this->getPosition();
         }
     }
@@ -324 +323 @@
         if (this->server_overwrite_ == this->client_overwrite_)
         {
-            this->setVelocity(this->client_linear_velocity_);
-            // The call above increments the overwrite. This is not desired to reduce traffic
-            --this->server_overwrite_;
+            MobileEntity::setVelocity(this->client_linear_velocity_);
+            this->server_linear_velocity_ = this->getVelocity();
         }
     }
@@ -334 +332 @@
         if (this->server_overwrite_ == this->client_overwrite_)
         {
-            this->setOrientation(this->client_orientation_);
-            // The call above increments the overwrite. This is not desired to reduce traffic
-            --this->server_overwrite_;
+            MobileEntity::setOrientation(this->client_orientation_);
+            this->server_orientation_ = this->getOrientation();
         }
     }
@@ -344 +341 @@
         if (this->server_overwrite_ == this->client_overwrite_)
         {
-            this->setAngularVelocity(this->client_angular_velocity_);
-            // The call above increments the overwrite. This is not desired to reduce traffic
-            --this->server_overwrite_;
+            MobileEntity::setAngularVelocity(this->client_angular_velocity_);
+            this->server_angular_velocity_ = this->getAngularVelocity();
         }
     }