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

Timestamp:

Dec 10, 2008, 1:38:17 PM (16 years ago)

Author:

rgrieder

Message:

Trying to synchronise phyiscs over the network.

• Removed derivation of CollisionShape from WorldEntity (BaseObject instead).

File:

• code/branches/physics/src/orxonox/objects/Scene.h (modified) (2 diffs)

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

@@ -70 +70 @@
             inline bool hasPhysics()
                 { return this->physicalWorld_ != 0; }
-            void setPhysicalWorld(bool wantsPhysics, const Vector3& worldAabbMin, const Vector3& worldAabbMax);
+            void setPhysicalWorld(bool wantsPhysics);//, const Vector3& worldAabbMin, const Vector3& worldAabbMax);
 
             void addRigidBody(btRigidBody* body);
@@ -85 +85 @@
             void networkcallback_applyAmbientLight()
                 { this->setAmbientLight(this->ambientLight_); }
+            void networkcallback_hasPhysics()
+                { this->setPhysicalWorld(this->bHasPhysics_); }
 
-            Ogre::SceneManager*    sceneManager_;
-            Ogre::SceneNode*       rootSceneNode_;
+            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_;
+            std::string              skybox_;
+            ColourValue              ambientLight_;
+            std::list<BaseObject*>   objects_;
+            bool                     bShadows_;
     };
 }