Changeset 2446 for code/branches/physics_merge/src/orxonox/objects/worldentities

Timestamp:

Dec 14, 2008, 7:08:36 PM (16 years ago)

Author:

rgrieder

Message:

• orxonox::Scene should work properly with XMLPort and network synchronisation, no matter what input. No guarantee of course
• If you disable physics completely and then reactivate it, all rigid bodies that were removed will be added again.
• new XML attributes: gravity, negativeWorldRange and positiveWorldRange

File:

• code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.cc (modified) (2 diffs)

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

@@ -312 +312 @@
         if (this->isActive() && this->hasPhysics() && !this->isPhysicsActive() && !this->parent_)
         {
-            this->getScene()->addRigidBody(this->physicalBody_);
+            this->getScene()->addPhysicalObject(this);
             this->bPhysicsActive_ = true;
         }
@@ -321 +321 @@
         if (this->isPhysicsActive())
         {
-            this->getScene()->removeRigidBody(this->physicalBody_);
+            this->getScene()->removePhysicalObject(this);
             this->bPhysicsActive_ = false;
         }