Changeset 2292 for code/branches/physics/src/orxonox/objects/Scene.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/Scene.h (modified) (4 diffs)

code/branches/physics/src/orxonox/objects/Scene.h

@@ -35 +35 @@
 #include "core/BaseObject.h"
 #include "util/Math.h"
+#include "objects/Tickable.h"
 
-#include "ogrebullet/Dynamics/OgreBulletDynamics.h"
+#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Scene : public BaseObject, public network::Synchronisable
+    class _OrxonoxExport Scene : public BaseObject, public network::Synchronisable, public Tickable
     {
         public:
@@ -55 +56 @@
 
             inline btDiscreteDynamicsWorld* getPhysicalWorld() const
-                { return this->dynamicsWorld_; }
+                { return this->physicalWorld_; }
 
             void setSkybox(const std::string& skybox);
@@ -69 +70 @@
                 { return this->bShadows_; }
 
+            inline const Vector3& getWorldAabbMax()
+            {
+                this->physicalWorld_->getBroadphase();
+            }
+
+            inline bool hasPhysics()
+                { return this->physicalWorld_ != 0; }
+            void setPhysicalWorld(bool wantsPhysics, const Vector3& worldAabbMin, const Vector3& worldAabbMax);
+
+            void tick(float dt);
+
         private:
             void addObject(BaseObject* object);
@@ -81 +93 @@
             Ogre::SceneNode*       rootSceneNode_;
 
-            btDiscreteDynamicsWorld* dynamicsWorld_;
-            btSequentialImpulseConstraintSolver* solver_;
-            btDefaultCollisionConfiguration* collisionConfiguration_;
-            btCollisionDispatcher* dispatcher_; 
-            // Point auf Bullet btDynamics world && solver
+            btDiscreteDynamicsWorld* physicalWorld_;
 
             std::string            skybox_;