Changeset 2563 for code/branches/presentation/src

Timestamp:

Jan 1, 2009, 7:37:52 PM (16 years ago)

Author:

rgrieder

Message:

When the Scene does not support physics, the physical bodies in the WE still get created. Therefore the WE's will be added to the Scene to be added to Bullet.
So when a Scene suddenly becomes physical, it will empty the queue with WE's to Bullet.
This was a problem when synchronising over the network: The scene may not yet have had physics when certains WE's already got synchronised.

Also fixed a bug the synchronisation of the physics status of a WE.

File:

• code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) (3 diffs)

code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -652 +652 @@
             this->getScene()->addPhysicalObject(this);
             this->bPhysicsActive_ = true;
+            this->bPhysicsActiveSynchronised_ = true;
         }
     }
@@ -662 +663 @@
             this->getScene()->removePhysicalObject(this);
             this->bPhysicsActive_ = false;
+            this->bPhysicsActiveSynchronised_ = false;
         }
     }
@@ -692 +694 @@
         if (!this->isCollisionTypeLegal(type))
             return;
-        if (type != None && !this->getScene()->hasPhysics())
-        {
-            CCOUT(2) << "Warning: Cannot have physical bodies in a non physical scene." << std::endl;
-            return;
-        }
 
         if (this->isPhysicsActive())