Changeset 2374 for code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.h

Timestamp:

Dec 10, 2008, 1:38:17 PM (17 years ago)

Author:

rgrieder

Message:

Trying to synchronise phyiscs over the network.

• Removed derivation of CollisionShape from WorldEntity (BaseObject instead).

File:

• code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.h (modified) (4 diffs)

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

@@ -164 +164 @@
                 { this->roll(angle); }
 
+            inline void scaleChanged()
+                { this->setScale3D(this->getScale3D()); }
+
             WorldEntity* parent_;
             unsigned int parentID_;
@@ -186 +189 @@
             bool isKinematic() const { return getCollisionType() == Kinematic; }
             bool isDynamic()   const { return getCollisionType() == Dynamic  ; }
+            bool isPhysicsRunning() const;
 
             inline CollisionType getCollisionType() const
@@ -201 +205 @@
             CollisionShape* getAttachedCollisionShape(unsigned int index) const;
 
-            inline CollisionShape* getCollisionShape()
+            inline CompoundCollisionShape* getCollisionShape()
                 { return this->collisionShape_; }
             inline btRigidBody* getPhysicalBody()
@@ -220 +224 @@
             void removeFromPhysicalWorld() const;
 
+            // network callbacks
+            void collisionTypeChanged();
+            void massChanged();
+
             CollisionType                collisionType_;
-            std::vector<CollisionShape*> attachedShapes_;
-            CollisionShape*              collisionShape_;
+            CollisionType                collisionTypeSynchronised_;
+            CompoundCollisionShape*      collisionShape_;
             btScalar                     mass_;
             btScalar                     childMass_;