Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.cc

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/WorldEntity.cc (modified) (7 diffs)

code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -181 +181 @@
 
         // Attach to parent if necessary
-        registerVariable(this->parentID_,       variableDirection::toclient, new NetworkCallback<WorldEntity>(this, &WorldEntity::networkcallback_parentChanged));
+        registerVariable(this->parentID_,       variableDirection::toclient, new NetworkCallback<WorldEntity>(this, &WorldEntity::parentChanged));
     }
 
@@ -188 +188 @@
         Network function that object this instance to its correct parent.
     */
-    void WorldEntity::networkcallback_parentChanged()
+    void WorldEntity::parentChanged()
     {
         if (this->parentID_ != OBJECTID_UNKNOWN)
@@ -362 +362 @@
         this->parentID_ = newParent->getObjectID();
 
-        this->parentChanged();
-
         // apply transform to collision shape
         this->collisionShape_->setPosition(this->getPosition());
         this->collisionShape_->setOrientation(this->getOrientation());
         // TODO: Scale
-
+        
         return true;
     }
@@ -408 +406 @@
         this->parent_ = 0;
         this->parentID_ = OBJECTID_UNKNOWN;
-
-        this->parentChanged();
 
         // reset orientation of the collisionShape (cannot be set within a WE usually)
@@ -492 +488 @@
 
     // Note: These functions are placed in WorldEntity.h as inline functions for the release build.
-#ifndef NDEBUG
+#ifndef _NDEBUG
     const Vector3& WorldEntity::getPosition() const
     {
@@ -660 +656 @@
         case TransformSpace::World:
             ogreRelativeTo = Ogre::Node::TS_WORLD; break;
-        default: OrxAssert(false, "Faulty TransformSpace::Enum assigned.");
         }
         this->node_->setDirection(direction, ogreRelativeTo, localDirectionVector);
@@ -760 +755 @@
         {
         case Dynamic:
-            this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() & !btCollisionObject::CF_STATIC_OBJECT & !btCollisionObject::CF_KINEMATIC_OBJECT);
+            this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() & !(btCollisionObject::CF_STATIC_OBJECT | btCollisionObject::CF_KINEMATIC_OBJECT));
             break;
         case Kinematic: