Changeset 2407 for code/branches/physics/src/orxonox/objects/worldentities/LinearEntity.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/LinearEntity.cc (modified) (4 diffs)

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

@@ -80 +80 @@
     void LinearEntity::overwritePosition()
     {
-        //COUT(0) << "Setting position on client: " << this->overwrite_position_ << std::endl;
         this->setPosition(this->overwrite_position_);
     }
@@ -86 +85 @@
     void LinearEntity::overwriteOrientation()
     {
-        //COUT(0) << "Setting orientation on client: " << this->overwrite_orientation_ << std::endl;
         this->setOrientation(this->overwrite_orientation_);
     }
@@ -109 +107 @@
     {
         if (!bContinuous)
-        {
-            //if (Core::isMaster())
-            //    COUT(0) << "Setting position on server: " << this->getPosition() << std::endl;
             this->overwrite_position_ = this->getPosition();
-        }
     }
 
@@ -119 +113 @@
     {
         if (!bContinuous)
-        {
-            //if (Core::isMaster())
-            //    COUT(0) << "Setting orientation on server: " << this->getOrientation() << std::endl;
             this->overwrite_orientation_ = this->getOrientation();
-        }
     }
 }