Changeset 2514 for code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.h

Timestamp:

Dec 21, 2008, 2:44:00 PM (17 years ago)

Author:

rgrieder

Message:

Resolved four issues with the collision shapes:

• NetworkCallback will of course not call functions virtually
• CompoundCollisionShapes with a WorldEntity parent don't have to attach themselves when synchronised
• Just in case: When changing a CollisionShape, the old gets destroyed AFTER everything has been updated
• CompoundCollisionShapes with a WorldEntity parent now update both the WE and the CompoundCollisionShape when something changes

Other changes

• Also replaced some redundant code while at it (updating the shapes was done individually)
• Like in WE, the CompoundCollisionShape deletes all its children when being destroyed itself. This requires in WE that the children get detached before the CompoundCollisionShape gets deleted.

File:

• code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.h (modified) (3 diffs)

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

@@ -66 +66 @@
                 { return this->scale_; }
 
+            void updateShape();
+
             void calculateLocalInertia(float mass, btVector3& inertia) const;
 
@@ -78 +80 @@
         protected:
             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;
 
             btCollisionShape*       collisionShape_;
@@ -83 +89 @@
 
         private:
-            void parentChanged();
-
             Vector3                 position_;
             Quaternion              orientation_;