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

Timestamp:

May 30, 2005, 2:19:41 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: fields are now time-independant

Location:

orxonox/trunk/src/lib/physics

Files:

• fields/field.h (modified) (1 diff)
• fields/gravity.cc (modified) (1 diff)
• fields/gravity.h (modified) (1 diff)
• fields/point_gravity.cc (modified) (1 diff)
• fields/point_gravity.h (modified) (1 diff)
• fields/twirl.cc (modified) (1 diff)
• fields/twirl.h (modified) (1 diff)
• physics_connection.cc (modified) (1 diff)
• physics_connection.h (modified) (1 diff)
• physics_engine.cc (modified) (1 diff)
• physics_interface.cc (modified) (1 diff)
• physics_interface.h (modified) (2 diffs)

orxonox/trunk/src/lib/physics/fields/field.h

@@ -43 +43 @@
       \returns The Force Vector
   */
-  virtual Vector calcForce(float dt, const Vector& data) const = 0;
+  virtual Vector calcForce(const Vector& data) const = 0;
 
   void setMagnitude(const float& magnitude);

orxonox/trunk/src/lib/physics/fields/gravity.cc

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

orxonox/trunk/src/lib/physics/fields/gravity.h

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

orxonox/trunk/src/lib/physics/fields/point_gravity.cc

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

orxonox/trunk/src/lib/physics/fields/point_gravity.h

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

orxonox/trunk/src/lib/physics/fields/twirl.cc

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

orxonox/trunk/src/lib/physics/fields/twirl.h

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

orxonox/trunk/src/lib/physics/physics_connection.cc

@@ -49 +49 @@
     \param dt The time to apply in Seconds
 */
-void PhysicsConnection::apply(const float& dt) const
+void PhysicsConnection::apply(void) const
 {
   if (likely(this->type == PCON_PhysIField && this->field->getMagnitude() != 0.0))
-      this->subject->applyField(this->field, dt);
+      this->subject->applyField(this->field);
   else ;
 }

orxonox/trunk/src/lib/physics/physics_connection.h

@@ -30 +30 @@
   virtual ~PhysicsConnection();
 
-  void apply(const float& dt) const;
+  void apply(void) const;
 
  private:

orxonox/trunk/src/lib/physics/physics_engine.cc

@@ -144 +144 @@
   while (enumConn)
     {
-      enumConn->apply(dt);
+      enumConn->apply();
       enumConn = iterator->nextElement();
     }

orxonox/trunk/src/lib/physics/physics_interface.cc

@@ -88 +88 @@
         
         
-void PhysicsInterface::applyField(Field* field, float dt)
+void PhysicsInterface::applyField(Field* field)
 {
   //  this->forceSum += force;

orxonox/trunk/src/lib/physics/physics_interface.h

@@ -15 +15 @@
 //! A Physics interface
 /**
-   here can be some longer description of this class
+   The PhysicsInterface is an extension to Any other object,
+   that can be used to turn it to be Physcally animated.
+   Still you have to connect fields.
+   IMPORTANT is, that when using PNodes this baseclass is ok.
+   BUT, when using any other class that does not by itself implement
+   PNode you __MUST__ implement all the virtual functions by your own
 */
 class PhysicsInterface : virtual public BaseObject
@@ -30 +35 @@
   inline float getTotalMass( void ) const { return mass + massChildren; };
 
-  virtual void applyField(Field* field, float dt);
+  virtual void applyField(Field* field);
   virtual void tickPhys( float dt );
 
  protected:
-  void recalcMass();
+  virtual void recalcMass();