Changeset 2407 for code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.cc

Timestamp:

Dec 11, 2008, 1:54:35 PM (15 years ago)

Author:

rgrieder

Message:

• Removed debug output
• Fixed a bug with parentID_ in CollisionShape
• Reactivated overwrite mechanism in ControllableEntity
• Build fix in WE for last commit.

File:

• code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (9 diffs)

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

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Reto Grieder
  *
  */
@@ -256 +256 @@
     {
         if (!this->bControlled_)
-        {
-            //COUT(0) << "override with server position: " << this << std::endl;
             this->setPosition(this->server_position_);
-        }
     }
 
@@ -282 +279 @@
     void ControllableEntity::processOverwrite()
     {
-        //if (this->bControlled_)
-        //{
-        //    COUT(0) << "complete override: " << this << std::endl;
-        //    this->setPosition(this->server_position_);
-        //    this->setVelocity(this->server_velocity_);
-        //    this->setOrientation(this->server_orientation_);
-
-        //    this->client_overwrite_ = this->server_overwrite_;
-        //}
+        if (this->bControlled_)
+        {
+            this->setPosition(this->server_position_);
+            this->setOrientation(this->server_orientation_);
+            this->setVelocity(this->server_linear_velocity_);
+            this->setAngularVelocity(this->server_angular_velocity_);
+
+            this->client_overwrite_ = this->server_overwrite_;
+        }
     }
 
     void ControllableEntity::processClientPosition()
     {
-        //if (this->server_overwrite_ == this->client_overwrite_)
-        if (!this->bControlled_)
-        {
-            //COUT(0) << "override with client position: " << this << std::endl;
-//            COUT(2) << "callback: setting client position" << endl;
+        if (this->server_overwrite_ == this->client_overwrite_)
+        {
             this->setPosition(this->client_position_);
-            //this->server_position_ = this->client_position_;
-        }
-        //else
-        //  COUT(2) << "callback: not setting client position" << endl;
+            // The call above increments the overwrite. This is not desired to reduce traffic
+            --this->server_overwrite_;
+        }
     }
 
     void ControllableEntity::processClientLinearVelocity()
     {
-        if (!this->bControlled_)
-        //if (this->server_overwrite_ == this->client_overwrite_)
+        if (this->server_overwrite_ == this->client_overwrite_)
         {
             this->setVelocity(this->client_linear_velocity_);
-            //this->server_velocity_ = this->client_velocity_;
+            // The call above increments the overwrite. This is not desired to reduce traffic
+            --this->server_overwrite_;
         }
     }
@@ -319 +312 @@
     void ControllableEntity::processClientOrientation()
     {
-        if (!this->bControlled_)
-        //if (this->server_overwrite_ == this->client_overwrite_)
+        if (this->server_overwrite_ == this->client_overwrite_)
         {
             this->setOrientation(this->client_orientation_);
-            //this->server_orientation_ = this->client_orientation_;
+            // The call above increments the overwrite. This is not desired to reduce traffic
+            --this->server_overwrite_;
         }
     }
@@ -329 +322 @@
     void ControllableEntity::processClientAngularVelocity()
     {
-        if (!this->bControlled_)
-        //if (this->server_overwrite_ == this->client_overwrite_)
+        if (this->server_overwrite_ == this->client_overwrite_)
         {
             this->setAngularVelocity(this->client_angular_velocity_);
-            //this->server_velocity_ = this->client_velocity_;
+            // The call above increments the overwrite. This is not desired to reduce traffic
+            --this->server_overwrite_;
         }
     }
@@ -342 +335 @@
         {
             this->server_position_ = this->getPosition();
-            ++this->server_overwrite_;
+            if (!bContinuous)
+                ++this->server_overwrite_;
         }
         else if (this->bControlled_)
@@ -355 +349 @@
         {
             this->server_orientation_ = this->getOrientation();
-            ++this->server_overwrite_;
+            if (!bContinuous)
+                ++this->server_overwrite_;
         }
         else if (this->bControlled_)
@@ -368 +363 @@
         {
             this->server_linear_velocity_ = this->getVelocity();
-            ++this->server_overwrite_;
+            if (!bContinuous)
+                ++this->server_overwrite_;
         }
         else if (this->bControlled_)
@@ -381 +377 @@
         {
             this->server_angular_velocity_ = this->getAngularVelocity();
-            ++this->server_overwrite_;
+            if (!bContinuous)
+                ++this->server_overwrite_;
         }
         else if (this->bControlled_)