Changeset 4186 in orxonox.OLD for orxonox/branches/physics/src/util/physics/fields

Timestamp:

May 14, 2005, 10:57:14 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: forces now time dependant

Location:

orxonox/branches/physics/src/util/physics/fields

Files:

• field.h (modified) (1 diff)
• gravity.cc (modified) (1 diff)
• gravity.h (modified) (1 diff)
• point_gravity.cc (modified) (1 diff)
• point_gravity.h (modified) (1 diff)
• twirl.cc (modified) (1 diff)
• twirl.h (modified) (1 diff)

orxonox/branches/physics/src/util/physics/fields/field.h

@@ -39 +39 @@
 
   /** 
+      \param dt The time over which to apply the force
       \param data This is the data given to this force, to calculate the ForceVector
       \returns The Force Vector
   */
-  virtual Vector calcForce(const Vector& data) const = 0;
+  virtual Vector calcForce(float dt, const Vector& data) const = 0;
 
   void setMagnitude(const float& magnitude);

orxonox/branches/physics/src/util/physics/fields/gravity.cc

@@ -45 +45 @@
    \returns The force.
 */
-Vector Gravity::calcForce(const Vector& data) const
+Vector Gravity::calcForce(float dt, const Vector& data) const
 {
-  return /*(this->getAbsDir().apply(Vector(0,1,0)))*/ Vector(0,-1,0) * this->getMagnitude();
+  return /*(this->getAbsDir().apply(Vector(0,1,0)))*/ Vector(0,-1,0) * this->getMagnitude() * dt;
 }
 

orxonox/branches/physics/src/util/physics/fields/gravity.h

@@ -21 +21 @@
   virtual ~Gravity();
 
-  virtual Vector calcForce(const Vector& data) const;
+  virtual Vector calcForce(float dt, const Vector& data) const;
 
  private:

orxonox/branches/physics/src/util/physics/fields/point_gravity.cc

@@ -45 +45 @@
    \returns The force.
 */
-Vector PointGravity::calcForce(const Vector& data) const
+Vector PointGravity::calcForce(float dt, const Vector& data) const
 {
-  return (this->getAbsCoor() - data) * this->getMagnitude();
+  return (this->getAbsCoor() - data) * this->getMagnitude() * dt;
 }
 

orxonox/branches/physics/src/util/physics/fields/point_gravity.h

@@ -21 +21 @@
   virtual ~PointGravity();
 
-  virtual Vector calcForce(const Vector& data) const;
+  virtual Vector calcForce(float dt, const Vector& data) const;
 
  private:

orxonox/branches/physics/src/util/physics/fields/twirl.cc

@@ -45 +45 @@
    \returns The force.
 */
-Vector Twirl::calcForce(const Vector& data) const
+Vector Twirl::calcForce(float dt, const Vector& data) const
 {
   return /*this->getAbsDir()*/ Vector(0,1,0).cross(this->getAbsCoor() - data)
-    * this->getMagnitude();
+    * this->getMagnitude() * dt;
 }
 

orxonox/branches/physics/src/util/physics/fields/twirl.h

@@ -21 +21 @@
   virtual ~Twirl();
 
-  virtual Vector calcForce(const Vector& data) const;
+  virtual Vector calcForce(float dt, const Vector& data) const;
 
  private: