Changeset 2292 for code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.h

Timestamp:

Nov 28, 2008, 1:25:16 AM (15 years ago)

Author:

rgrieder

Message:

Finally managed to work out some physics. According to my tests, collisions with simple spheres should work with dynamic/kinematic/static objects. There are currently only a limited number of XML parameters, but we're surely going to extend that. Furthermore there is some more thinking to be done concerning changes of btRigidBody properties when it's already added to the world.

File:

• code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.h (modified) (1 diff)

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

@@ -69 +69 @@
 
         private:
-
-            virtual void rollChanged() { }
-            virtual void positionChanged() { }
-            virtual void translateChanged() { }
-            virtual void orientationChanged() { }
-            virtual void rotateChanged() { }
-            virtual void yawChanged() { }
-            virtual void pitchChanged() { }
-            virtual void lookAtChanged() { }
-            virtual void directionChanged( ) { }
-
             //void attachPhysicalObject(WorldEntity* object);
 
-            //// Bullet btMotionState related
-            //void setWorldTransform(const btTransform& worldTrans)
-            //{
-            //    this->node_->setPosition(worldTrans.getOrigin().x(), worldTrans.getOrigin().y(), worldTrans.getOrigin().z());
-            //    this->node_->setOrientation(worldTrans.getRotation().w(), worldTrans.getRotation().x(), worldTrans.getRotation().y(), worldTrans.getRotation().z());
-            //    //this->velocity_.x = this->physicalBody_->
-            //}
+            virtual void internalSetVelocity(const Vector3& velocity) { }
+            virtual void positionChanged() { }
+            virtual void orientationChanged() { }
 
-            //// Bullet btMotionState related
-            //void getWorldTransform(btTransform& worldTrans) const
-            //{
-            //    worldTrans.setOrigin(btVector3(node_->getPosition().x, node_->getPosition().y, node_->getPosition().z));
-            //    worldTrans.setRotation(btQuaternion(node_->getOrientation().w, node_->getOrientation().x, node_->getOrientation().y, node_->getOrientation().z));
-            //}
+            // Bullet btMotionState related
+            void setWorldTransform(const btTransform& worldTrans);
+            void getWorldTransform(btTransform& worldTrans) const;
     };
 }