Changeset 2515 for code

Timestamp:

Dec 21, 2008, 3:13:57 PM (16 years ago)

Author:

rgrieder

Message:

Callbacks with function pointers work virtually after all.

Location:

code/branches/presentation/src/orxonox/objects/collisionshapes

Files:

• CollisionShape.cc (modified) (1 diff)
• CollisionShape.h (modified) (1 diff)

code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc

@@ -80 +80 @@
     void CollisionShape::registerVariables()
     {
-        registerVariable(this->parentID_, variableDirection::toclient, new NetworkCallback<CollisionShape>(this, &CollisionShape::parentChangedCallback));
+        registerVariable(this->parentID_, variableDirection::toclient, new NetworkCallback<CollisionShape>(this, &CollisionShape::parentChanged));
     }
 

code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.h

@@ -81 +81 @@
             virtual void updateParent();
             virtual void parentChanged();
-            // Note: This is required because the NetworkCallback will not call functions virtually
-            void parentChangedCallback() { this->parentChanged(); }
             virtual btCollisionShape* createNewShape() const = 0;