Changeset 8190 in orxonox.OLD for trunk/src/lib/physics

Timestamp:

Jun 7, 2006, 3:00:01 PM (18 years ago)

Author:

patrick

Message:

trunk: merged the cr branche to trunk

File:

• trunk/src/lib/physics/physics_interface.h (modified) (2 diffs)

trunk/src/lib/physics/physics_interface.h

@@ -39 +39 @@
   inline float getTotalMass( void ) const { return mass + massChildren; };
 
+  /** @returns the velocity */
+  inline const Vector getVelocity() { return this->velocity; }
+  /** @returns the acceleration */
+  inline const Vector getAcceleration() { return this->acceleration; }
+
   virtual void applyForce(const Vector& force);
   virtual void applyField(Field* field);
@@ -51 +56 @@
   float          massChildren;          //!< Sum of the masses of the children nodes
 
+  Vector         velocity;              //!< the velocity of the masspoint
+  Vector         acceleration;          //!< acceleration of the masspoint
+
   Vector         forceSum;              //!< Total central force for this tick
   Quaternion     momentumSum;           //!< Total momentum in this tick