Changeset 2192 for code/branches/physics/src/orxonox/objects/Scene.h

Timestamp:

Nov 12, 2008, 1:44:09 PM (17 years ago)

Author:

rgrieder

Message:

Reverted all changes of attempt to update physics branch.

Location:

code/branches/physics

Files:

• . (modified) (1 prop)
• src/orxonox/objects/Scene.h (modified) (3 diffs)

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

@@ -36 +36 @@
 #include "util/Math.h"
 
+#include "ogrebullet/Dynamics/OgreBulletDynamics.h"
+
 namespace orxonox
 {
@@ -51 +53 @@
             inline Ogre::SceneNode* getRootSceneNode() const
                 { return this->rootSceneNode_; }
+
+            inline btDiscreteDynamicsWorld* getPhysicalWorld() const
+                { return this->dynamicsWorld_; }
 
             void setSkybox(const std::string& skybox);
@@ -75 +80 @@
             Ogre::SceneManager*    sceneManager_;
             Ogre::SceneNode*       rootSceneNode_;
+
+            btDiscreteDynamicsWorld* dynamicsWorld_;
+            btSequentialImpulseConstraintSolver* solver_;
+            btDefaultCollisionConfiguration* collisionConfiguration_;
+            btCollisionDispatcher* dispatcher_; 
+            // Point auf Bullet btDynamics world && solver
+
             std::string            skybox_;
             ColourValue            ambientLight_;