Changeset 2423 for code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.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/worldentities/WorldEntity.h (modified) (7 diffs)

code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.h

@@ -35 +35 @@
 #define OGRE_FORCE_ANGLE_TYPES
 #include <OgreSceneNode.h>
-
 #include "LinearMath/btMotionState.h"
 
@@ -126 +125 @@
 
             void attach(WorldEntity* object);
-//            void attachAsdf(BlinkingBillboard* object);
             void detach(WorldEntity* object);
             WorldEntity* getAttachedObject(unsigned int index) const;
-//            BlinkingBillboard* getAttachedAsdfObject(unsigned int index) const;
             inline const std::set<WorldEntity*>& getAttachedObjects() const
                 { return this->children_; }
@@ -146 +143 @@
             inline WorldEntity* getParent() const
                 { return this->parent_; }
+
+            void notifyChildPropsChanged();
 
         protected:
@@ -185 +184 @@
             };
 
-            bool hasPhysics()  const { return getCollisionType() != None     ; }
-            bool isStatic()    const { return getCollisionType() == Static   ; }
-            bool isKinematic() const { return getCollisionType() == Kinematic; }
-            bool isDynamic()   const { return getCollisionType() == Dynamic  ; }
-            bool isPhysicsRunning() const;
+            bool hasPhysics()       const { return getCollisionType() != None     ; }
+            bool isStatic()         const { return getCollisionType() == Static   ; }
+            bool isKinematic()      const { return getCollisionType() == Kinematic; }
+            bool isDynamic()        const { return getCollisionType() == Dynamic  ; }
+            bool isPhysicsActive()  const { return this->bPhysicsActive_; }
+            bool addedToPhysicalWorld() const;
+
+            void activatePhysics();
+            void deactivatePhysics();
 
             inline CollisionType getCollisionType() const
@@ -201 +204 @@
             inline float getMass() const
                 { return this->mass_; }
-
-            void attachCollisionShape(CollisionShape* shape, bool bWorldEntityRoot = false);
+            inline float getTotalMass() const
+                { return this->mass_ + this->childrenMass_; }
+
+            void attachCollisionShape(CollisionShape* shape);
+            void detachCollisionShape(CollisionShape* shape);
             CollisionShape* getAttachedCollisionShape(unsigned int index) const;
 
@@ -210 +216 @@
                 { return this->physicalBody_; }
 
+            void notifyCollisionShapeChanged();
+            void notifyChildMassChanged();
+
         protected:
             virtual bool isCollisionTypeLegal(CollisionType type) const = 0;
@@ -217 +226 @@
         private:
             void updateCollisionType();
-            void mergeCollisionShape(CollisionShape* shape);
-            void internalSetMassProps();
-            btVector3 getLocalInertia(btScalar mass) const;
-            bool checkPhysics() const;
-            void addToPhysicalWorld() const;
-            void removeFromPhysicalWorld() const;
+            void recalculatePhysicsProps();
 
             // network callbacks
             void collisionTypeChanged();
             void massChanged();
+            void physicsActivityChanged();
 
             CollisionType                collisionType_;
             CollisionType                collisionTypeSynchronised_;
+            bool                         bPhysicsActive_;
+            bool                         bPhysicsActiveSynchronised_;
             CompoundCollisionShape*      collisionShape_;
             btScalar                     mass_;
-            btScalar                     childMass_;
+            btScalar                     childrenMass_;
     };
 }