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

Timestamp:

Nov 28, 2008, 1:25:16 AM (15 years ago)

Author:

rgrieder

Message:

Finally managed to work out some physics. According to my tests, collisions with simple spheres should work with dynamic/kinematic/static objects. There are currently only a limited number of XML parameters, but we're surely going to extend that. Furthermore there is some more thinking to be done concerning changes of btRigidBody properties when it's already added to the world.

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);
@@ -127 +135 @@
                 { this->node_->scale(scale, scale, scale); }
 
-            void setcollisionRadius(float radius);
-            float getcollisionRadius();
-
             bool hasPhysics()  { return this->physicalBody_; }
             bool isKinematic() { return this->physicalBody_ && this->physicalBody_->isKinematicObject(); }
@@ -147 +152 @@
                 { 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 attachPhysicalObject(WorldEntity* object);
+            virtual void setCollisionType(CollisionType type);
 
             Ogre::SceneNode* node_;
-            bool bAddedToPhysicalWorld_;
             btRigidBody* physicalBody_;
 
@@ -171 +187 @@
                 { this->roll(angle); }
 
-            // Bullet btMotionState related
-            virtual void setWorldTransform(const btTransform& worldTrans)
-            {
-            }
-
-            // Bullet btMotionState related
-            virtual void getWorldTransform(btTransform& worldTrans) const
-            {
-            }
-
             WorldEntity* parent_;
             unsigned int parentID_;