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

Timestamp:

Nov 29, 2008, 12:45:19 AM (15 years ago)

Author:

rgrieder

Message:

Clarified use of different physical bodies. The "collisionType" XML attribute of WE specifies the following:
"none": There is not physical body at all. Physics disabled.
"static": It is a StaticEntity with physics. Any other derived class of WE issues an exception by choosing this collision type.
"kinematic" or "dynamic": MovableEntity with physics. StaticEntity issues an exception when choosing one of these two.

Added two new Exceptions: ParseError and PhysicsViolation.

File:

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

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

@@ -46 +46 @@
     class _OrxonoxExport WorldEntity : public BaseObject, public network::Synchronisable, public btMotionState
     {
-        public:
-            enum CollisionType
-            {
-                Dynamic,
-                Kinematic,
-                Static
-            };
-
         public:
             WorldEntity(BaseObject* creator);
@@ -135 +127 @@
                 { this->node_->scale(scale, scale, scale); }
 
-            bool hasPhysics()  { return this->physicalBody_; }
-            bool isKinematic() { return this->physicalBody_ && this->physicalBody_->isKinematicObject(); }
-            bool isDynamic()   { return this->physicalBody_ && !this->physicalBody_->isStaticOrKinematicObject(); }
-
             void attach(WorldEntity* object);
             void detach(WorldEntity* object);
@@ -159 +147 @@
                 { return this->parent_; }
 
-            void setCollisionRadius(float radius);
-            float getCollisionRadius();
-
-            void setCollisionTypeStr(const std::string& type);
-            std::string getCollisionTypeStr();
-
-            void setMass(float mass);
-            float getMass();
-
-            CollisionType getCollisionType();
-
         protected:
-            //virtual btCollisionShape* getCollisionShape() = 0;
-
-            void createPhysicalBody();
-            //virtual void attachPhysicalObject(WorldEntity* object);
-            virtual void setCollisionType(CollisionType type);
-
             Ogre::SceneNode* node_;
-            btRigidBody* physicalBody_;
 
         private:
@@ -197 +167 @@
             unsigned int parentID_;
             std::set<WorldEntity*> children_;
+
+            /////////////
+            // Physics //
+            /////////////
+
+        public:
+            enum CollisionType
+            {
+                Dynamic,
+                Kinematic,
+                Static,
+                None
+            };
+
+            bool hasPhysics()  { return getCollisionType() != None; }
+
+            CollisionType getCollisionType() { return this->collisionType_; }
+            void setCollisionType(CollisionType type);
+
+            void setCollisionTypeStr(const std::string& type);
+            std::string getCollisionTypeStr();
+
+            bool isStatic()    { return getCollisionType() == Static   ; }
+            bool isKinematic() { return getCollisionType() == Kinematic; }
+            bool isDynamic()   { return getCollisionType() == Dynamic  ; }
+
+            void setMass(float mass);
+            float getMass();
+
+            void setCollisionRadius(float radius);
+            float getCollisionRadius();
+
+        protected:
+            //virtual btCollisionShape* getCollisionShape() = 0;
+            //virtual void attachPhysicalObject(WorldEntity* object);
+
+            virtual bool isCollisionTypeLegal(CollisionType type) = 0;
+            bool checkPhysics();
+            void updateCollisionType();
+
+            btRigidBody*  physicalBody_;
+
+        private:
+            CollisionType collisionType_;
+
     };
 }