Changeset 2514 for code/branches/presentation/src/orxonox/objects/collisionshapes/ConeCollisionShape.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/ConeCollisionShape.h (modified) (1 diff)

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

@@ -46 +46 @@
 
             inline void setRadius(float value)
-                { this->radius_ = value; updateCone(); }
+                { this->radius_ = value; updateShape(); }
             inline float getRadius() const
                 { return radius_; }
 
             inline void setHeight(float value)
-                { this->height_ = value; updateCone(); }
+                { this->height_ = value; updateShape(); }
             inline float getHeight() const
                 { return this->height_; }
 
-            void updateCone();
+        private:
+            btCollisionShape* createNewShape() const;
 
-        private:
             float radius_;
             float height_;