Changeset 2423 for code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.cc

Timestamp:

Dec 13, 2008, 4:14:36 PM (15 years ago)

Author:

rgrieder

Message:

• Added detach functions to CollisionShapes
• Added update functions across the CollisionShape hierarchy so that when you change the radius of a sphere, everything up to the WE gets updated.
• Setting the btCollisionShape at run time doesn't work after all, fixed that (you can still do it, just a question of internals)
• Improved network synchronisation
• new WE function: addedToPhysicalWorld() to check whether we can still perform operations that are disallowed at run time (esp. StaticEntity)

Conclusively, I can say that right now, all operations considering physics should be handled automatically, bugs not withstanding.

File:

• code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.cc (modified) (9 diffs)

code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.cc

@@ -60 +60 @@
     void StaticEntity::setPosition(const Vector3& position)
     {
-        if (this->isPhysicsRunning())
+        if (this->addedToPhysicalWorld())
             ThrowException(PhysicsViolation, "Cannot change position or orientation of a StaticEntity with physics at run time.");
         if (this->isStatic())
@@ -74 +74 @@
     void StaticEntity::translate(const Vector3& distance, Ogre::Node::TransformSpace relativeTo)
     {
-        if (this->isPhysicsRunning())
+        if (this->addedToPhysicalWorld())
             ThrowException(PhysicsViolation, "Cannot change position or orientation of a StaticEntity with physics at run time.");
         if (this->isStatic())
@@ -88 +88 @@
     void StaticEntity::setOrientation(const Quaternion& orientation)
     {
-        if (this->isPhysicsRunning())
+        if (this->addedToPhysicalWorld())
             ThrowException(PhysicsViolation, "Cannot change position or orientation of a StaticEntity with physics at run time.");
         if (this->isStatic())
@@ -102 +102 @@
     void StaticEntity::rotate(const Quaternion& rotation, Ogre::Node::TransformSpace relativeTo)
     {
-        if (this->isPhysicsRunning())
+        if (this->addedToPhysicalWorld())
             ThrowException(PhysicsViolation, "Cannot change position or orientation of a StaticEntity with physics at run time.");
         if (this->isStatic())
@@ -117 +117 @@
     void StaticEntity::yaw(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
     {
-        if (this->isPhysicsRunning())
+        if (this->addedToPhysicalWorld())
             ThrowException(PhysicsViolation, "Cannot change position or orientation of a StaticEntity with physics at run time.");
         if (this->isStatic())
@@ -133 +133 @@
     void StaticEntity::pitch(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
     {
-        if (this->isPhysicsRunning())
+        if (this->addedToPhysicalWorld())
             ThrowException(PhysicsViolation, "Cannot change position or orientation of a StaticEntity with physics at run time.");
         if (this->isStatic())
@@ -149 +149 @@
     void StaticEntity::roll(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
     {
-        if (this->isPhysicsRunning())
+        if (this->addedToPhysicalWorld())
             ThrowException(PhysicsViolation, "Cannot change position or orientation of a StaticEntity with physics at run time.");
         if (this->isStatic())
@@ -165 +165 @@
     void StaticEntity::lookAt(const Vector3& target, Ogre::Node::TransformSpace relativeTo, const Vector3& localDirectionVector)
     {
-        if (this->isPhysicsRunning())
+        if (this->addedToPhysicalWorld())
             ThrowException(PhysicsViolation, "Cannot change position or orientation of a StaticEntity with physics at run time.");
         if (this->isStatic())
@@ -179 +179 @@
     void StaticEntity::setDirection(const Vector3& direction, Ogre::Node::TransformSpace relativeTo, const Vector3& localDirectionVector)
     {
-        if (this->isPhysicsRunning())
+        if (this->addedToPhysicalWorld())
             ThrowException(PhysicsViolation, "Cannot change position or orientation of a StaticEntity with physics at run time.");
         if (this->isStatic())