Changeset 2178 for code/branches/physics/src/orxonox/objects/Scene.cc

Timestamp:

Nov 11, 2008, 10:30:49 PM (16 years ago)

Author:

rgrieder

Message:

• Added first basic construct of object hierarchy with physics.
• Added a few bullet classes to OrxonoxPrereqs.h
• Added bullet header files to the msvc projects.

No Implementation at all yet, but the game still compiles and runs. Please update the media repository.

File:

• code/branches/physics/src/orxonox/objects/Scene.cc (modified) (4 diffs)

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

@@ -62 +62 @@
                 this->rootSceneNode_ = 0;
             }
-        // create bullet world; bullet solver etc.
+        }
+        else
+        {
+            // create a dummy SceneManager of our own since we don't have Ogre::Root.
+            this->sceneManager_ = new Ogre::DefaultSceneManager("");
+            this->rootSceneNode_ = this->sceneManager_->getRootSceneNode();
+        }
+
+        /////////////
+        // Physics //
+        /////////////
+
+        // create bullet world; bullet solver etc.
 
         // int maxProxies = 1024;
@@ -70 +82 @@
         bt32BitAxisSweep3* broadphase = new bt32BitAxisSweep3(worldAabbMin,worldAabbMax);
 
-        this -> collisionConfiguration_ = new btDefaultCollisionConfiguration();
+        this -> collisionConfiguration_ = new btDefaultCollisionConfiguration();
         this -> dispatcher_ = new btCollisionDispatcher(collisionConfiguration_);
 
@@ -77 +89 @@
         this -> dynamicsWorld_ =  new btDiscreteDynamicsWorld(dispatcher_,broadphase,solver_,collisionConfiguration_);
 
-      //  dynamicsWorld->setGravity(btVector3(0,-10,0));
+        dynamicsWorld_->setGravity(btVector3(0,-10,0));
 
-        }
-        else
-        {
-            // create a dummy SceneManager of our own since we don't have Ogre::Root.
-            this->sceneManager_ = new Ogre::DefaultSceneManager("");
-            this->rootSceneNode_ = this->sceneManager_->getRootSceneNode();
-        }
 
         // test test test
@@ -108 +113 @@
             if (Ogre::Root::getSingletonPtr())
             {
-//                this->sceneManager_->destroySceneNode(this->rootSceneNode_->getName()); // TODO: remove getName() for newer versions of Ogre
                 Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
             }