Changeset 2452 for code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc

Timestamp:

Dec 14, 2008, 10:53:44 PM (17 years ago)

Author:

rgrieder

Message:

Minor changes and added localInertia_ to worldentity for faster access.

File:

• code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) (1 diff)

code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc

@@ -108 +108 @@
     }
 
-    btVector3 CollisionShape::getLocalInertia(btScalar mass) const
+    void CollisionShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
     {
-        btVector3 inertia(0, 0, 0);
         if (this->collisionShape_)
             this->collisionShape_->calculateLocalInertia(mass, inertia);
-        return inertia;
+        else
+            inertia.setValue(0, 0, 0);
     }
 }