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

Timestamp:

May 30, 2005, 4:57:04 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: ok… forces now apply to the right objects, but i don't really like the way it works…. we will see….

Location:

orxonox/trunk/src/lib/physics

Files:

• physics_interface.cc (modified) (2 diffs)
• physics_interface.h (modified) (3 diffs)

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

@@ -36 +36 @@
    \brief standard constructor
 */
-PhysicsInterface::PhysicsInterface () 
+PhysicsInterface::PhysicsInterface (void* objectPointer) 
 {
+  this->objectPointer = objectPointer;
+
   //   this->setClassName ("PhysicsInterface");
    this->mass = 1;
@@ -90 +92 @@
 void PhysicsInterface::applyField(Field* field)
 {
-  this->forceSum += field->calcForce(dynamic_cast<PNode*>(this)->getAbsCoor());
+  PNode* tmp = (PNode*) objectPointer;
+  this->forceSum += field->calcForce(tmp->getAbsCoor());  
 }
 
 void PhysicsInterface::tickPhys( float dt )
 {
-  Vector acc = this->forceSum / ( this->massChildren + this->mass );
-  PNode* coorTick =  (PNode*) this;
-  coorTick->setRelCoor(coorTick->getRelCoor() + (this->forceSum / this->mass * dt));
-
+  //  Vector acc = this->forceSum / ( this->massChildren + this->mass );
+  PNode* coorTick =  (PNode*)(this->objectPointer);
+  if (coorTick)
+    coorTick->setRelCoor(coorTick->getRelCoor() + this->forceSum/this->mass * dt);
   this->forceSum = Vector(0,0,0);
   // todo: introduce kinematics

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

@@ -9 +9 @@
 #include "vector.h"
 #include "base_object.h"
+
+#ifndef NULL
+#define NULL 0
+#endif
 
 // Forward Declaration
@@ -26 +30 @@
 
  public:
-  PhysicsInterface();
+  PhysicsInterface(void* objectPointer);
   virtual ~PhysicsInterface();
   /** \param mass the mass to set for this node. */
@@ -43 +47 @@
   
  private:
+  void* objectPointer;
   float mass;                   //!< Mass of this object
   float massChildren;           //!< Sum of the masses of the children nodes