Changeset 2454

Timestamp:

Dec 14, 2008, 11:02:58 PM (16 years ago)

Author:

rgrieder

Message:

Replaced bad collision type exceptions with asserts. The developer will know about the obvious error immediately and the end end user only sees a warning.

Location:

code/branches/physics_merge/src/orxonox/objects/worldentities

Files:

• MobileEntity.cc (modified) (1 diff)
• StaticEntity.cc (modified) (1 diff)
• WorldEntity.cc (modified) (1 diff)
• pawns/SpaceShip.cc (modified) (1 diff)

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

@@ -158 +158 @@
         if (type == WorldEntity::Static)
         {
-            ThrowException(PhysicsViolation, "Cannot tell a MobileEntity to have static collision type");
+            CCOUT(1) << "Error: Cannot tell a MobileEntity to have static collision type! Ignoring." << std::endl;
+            assert(false); // Only in debug mode
             return false;
         }

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

@@ -99 +99 @@
         if (type == WorldEntity::Kinematic || type == WorldEntity::Dynamic)
         {
-            ThrowException(PhysicsViolation, "Cannot tell a StaticEntity to have kinematic or dynamic collision type");
+            CCOUT(1) << "Error: Cannot tell a StaticEntity to have kinematic or dynamic collision type! Ignoring." << std::endl;
+            assert(false); // Only in debug mode
             return false;
         }

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

@@ -463 +463 @@
         // Check for type legality. Could be StaticEntity or MobileEntity
         if (!this->isCollisionTypeLegal(type))
-            return; // exception gets issued anyway
+            return;
         if (type != None && !this->getScene()->hasPhysics())
         {

code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

@@ -95 +95 @@
         if (type != WorldEntity::Dynamic)
         {
-            ThrowException(PhysicsViolation, "Cannot tell a SpaceShip not to be dynamic!");
+            CCOUT(1) << "Error: Cannot tell a SpaceShip not to be dynamic! Ignoring." << std::endl;
+            assert(false); // Only in debug mode
             return false;
         }