Changeset 2306 for code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc

Timestamp:

Dec 2, 2008, 4:59:36 PM (15 years ago)

Author:

rgrieder

Message:

• More dealings with not yet implemented scaling of physical objects.
• Clearer handling of masses specified by setMass() (also taking into account mass of child WE)
• Now calculating the inertia tensor as well according to mass and collisionShape
• Bugfix when calling Bullet solver

File:

• code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc (modified) (2 diffs)

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

@@ -32 +32 @@
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 
+#include "util/Debug.h"
 #include "util/Exception.h"
 #include "core/CoreIncludes.h"
@@ -220 +221 @@
         this->node_->setOrientation(Quaternion(worldTrans.getRotation().w(), worldTrans.getRotation().x(), worldTrans.getRotation().y(), worldTrans.getRotation().z()));
         const btVector3& velocity = this->physicalBody_->getLinearVelocity();
-        this->velocity_ = Vector3(velocity.x(), velocity.y(), velocity.z());
+        this->velocity_.x = velocity.x();
+        this->velocity_.y = velocity.y();
+        this->velocity_.z = velocity.z();
         velocityChanged();
         positionChanged();