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

Timestamp:

Nov 29, 2008, 12:45:19 AM (15 years ago)

Author:

rgrieder

Message:

Clarified use of different physical bodies. The "collisionType" XML attribute of WE specifies the following:
"none": There is not physical body at all. Physics disabled.
"static": It is a StaticEntity with physics. Any other derived class of WE issues an exception by choosing this collision type.
"kinematic" or "dynamic": MovableEntity with physics. StaticEntity issues an exception when choosing one of these two.

Added two new Exceptions: ParseError and PhysicsViolation.

File:

• code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.cc (modified) (1 diff)

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

@@ -60 +60 @@
     }
 
-    void StaticEntity::setCollisionType(CollisionType type)
+    bool StaticEntity::isCollisionTypeLegal(WorldEntity::CollisionType type)
     {
-        if (!this->physicalBody_)
-            return;
-        if (type != Static)
-            ThrowException(Argument, "Cannot tell a StaticEntity to be kinematic or dynamic");
-
-        this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() & !btCollisionObject::CF_KINEMATIC_OBJECT | btCollisionObject::CF_STATIC_OBJECT);
+        if (type == WorldEntity::Static)
+        {
+            ThrowException(PhysicsViolation, "Cannot tell a MovableEntity to have static collision type");
+            return false;
+        }
+        else
+            return true;
     }