Changeset 2442 for code/branches/physics_merge/src/orxonox/objects/Scene.h

Timestamp:

Dec 14, 2008, 4:16:52 PM (15 years ago)

Author:

rgrieder

Message:

Finally merged physics stuff. Target is physics_merge because I'll have to do some testing first.

Location:

code/branches/physics_merge

Files:

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

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

@@ -53 +53 @@
                 { return this->rootSceneNode_; }
 
+            inline btDiscreteDynamicsWorld* getPhysicalWorld() const
+                { return this->physicalWorld_; }
+
             void setSkybox(const std::string& skybox);
             inline const std::string& getSkybox() const
@@ -65 +68 @@
                 { return this->bShadows_; }
 
+            inline bool hasPhysics()
+                { return this->physicalWorld_ != 0; }
+            void setPhysicalWorld(bool wantsPhysics);//, const Vector3& worldAabbMin, const Vector3& worldAabbMax);
+
+            void addRigidBody(btRigidBody* body);
+            void removeRigidBody(btRigidBody* body);
+
             virtual void tick(float dt);
 
@@ -75 +85 @@
             void networkcallback_applyAmbientLight()
                 { this->setAmbientLight(this->ambientLight_); }
+            void networkcallback_hasPhysics()
+                { this->setPhysicalWorld(this->bHasPhysics_); }
 
-            Ogre::SceneManager*    sceneManager_;
-            Ogre::SceneNode*       rootSceneNode_;
-            std::string            skybox_;
-            ColourValue            ambientLight_;
-            std::list<BaseObject*> objects_;
-            bool                   bShadows_;
+            Ogre::SceneManager*      sceneManager_;
+            Ogre::SceneNode*         rootSceneNode_;
+
+            btDiscreteDynamicsWorld* physicalWorld_;
+            std::set<btRigidBody*>   physicsQueue_;
+            bool                     bHasPhysics_;
+
+            std::string              skybox_;
+            ColourValue              ambientLight_;
+            std::list<BaseObject*>   objects_;
+            bool                     bShadows_;
     };
 }