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

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

@@ -108 +108 @@
         if (this->isDynamic())
         {
-            //if (this->isPhysicsRunning())
-            //    return;
             btTransform transf = this->physicalBody_->getWorldTransform();
             transf.setOrigin(btVector3(position.x, position.y, position.z));
@@ -115 +113 @@
         }
 
-        //COUT(0) << "setting position: " << position << std::endl;
         this->node_->setPosition(position);
         positionChanged(false);
@@ -212 +209 @@
             OrxAssert(relativeTo == Ogre::Node::TS_LOCAL, "Cannot align physical object relative \
                                                           to any other space than TS_LOCAL.");
-            //btTransform transf = this->physicalBody_->getWorldTransform();
-            //this->physicalBody_->setWorldTransform(transf);
         }
 
@@ -227 +222 @@
             OrxAssert(relativeTo == Ogre::Node::TS_LOCAL, "Cannot align physical object relative \
                                                           to any other space than TS_LOCAL.");
-            //btTransform transf = this->physicalBody_->getWorldTransform();
-            //this->physicalBody_->setWorldTransform(transf);
         }
 
@@ -288 +281 @@
         this->node_->setPosition(Vector3(worldTrans.getOrigin().x(), worldTrans.getOrigin().y(), worldTrans.getOrigin().z()));
         this->node_->setOrientation(Quaternion(worldTrans.getRotation().w(), worldTrans.getRotation().x(), worldTrans.getRotation().y(), worldTrans.getRotation().z()));
-        COUT(0) << "setting world transform: " << omni_cast<std::string>(node_->getPosition()) << std::endl;
         this->linearVelocity_.x = this->physicalBody_->getLinearVelocity().x();
         this->linearVelocity_.y = this->physicalBody_->getLinearVelocity().y();