Changeset 2423 for code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h

Timestamp:

Dec 13, 2008, 4:14:36 PM (15 years ago)

Author:

rgrieder

Message:

• Added detach functions to CollisionShapes
• Added update functions across the CollisionShape hierarchy so that when you change the radius of a sphere, everything up to the WE gets updated.
• Setting the btCollisionShape at run time doesn't work after all, fixed that (you can still do it, just a question of internals)
• Improved network synchronisation
• new WE function: addedToPhysicalWorld() to check whether we can still perform operations that are disallowed at run time (esp. StaticEntity)

Conclusively, I can say that right now, all operations considering physics should be handled automatically, bugs not withstanding.

File:

• code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (modified) (1 diff)

code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h

@@ -45 +45 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void addChildShape(CollisionShape* shape, bool bWorldEntityRoot = false);
+            void addChildShape(CollisionShape* shape);
+            void removeChildShape(CollisionShape* shape);
+            void removeAllChildShapes();
             CollisionShape* getChildShape(unsigned int index) const;
 
-            virtual btCollisionShape* getCollisionShape() const;
+            void updateChildShape(CollisionShape* shape);
 
-            inline bool empty() const
-                { return this->childShapes_.size() == 0; }
+        protected:
+            virtual void updateParent();
 
         private:
-            btCompoundShape*             compoundShape_;
-            std::vector<CollisionShape*> childShapes_;
+            void updatePublicShape();
+
+            btCompoundShape* compoundShape_;
+            std::map<CollisionShape*, btCollisionShape*> childShapes_;
     };
 }