Changeset 4558 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jun 8, 2005, 9:02:12 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: PhysicsEngine looks better (it speeds up things… but i do not exactly know if it works

Location:

orxonox/trunk/src/lib/physics

Files:

• physics_engine.cc (modified) (9 diffs)
• physics_engine.h (modified) (3 diffs)
• physics_interface.cc (modified) (3 diffs)
• physics_interface.h (modified) (1 diff)

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

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -28 +28 @@
    \brief standard constructor
 */
-PhysicsEngine::PhysicsEngine() 
+PhysicsEngine::PhysicsEngine()
 {
    this->setClassName ("PhysicsEngine");
@@ -46 +46 @@
 
 */
-PhysicsEngine::~PhysicsEngine () 
+PhysicsEngine::~PhysicsEngine ()
 {
   PhysicsEngine::singletonRef = NULL;
@@ -71 +71 @@
 void PhysicsEngine::removePhysicsInterface(PhysicsInterface* physicsInterface)
 {
-  this->interfaces->remove(physicsInterface);  
+  this->interfaces->remove(physicsInterface);
 }
 
@@ -99 +99 @@
    \brief adds A Physical Connection to the List of Connections
    \param connection the Connection to add
-   
+
    Usually this is done through the constructor of PhysicshConnections
 */
@@ -110 +110 @@
    \brief removes A Physical Connection from the List of Connections
    \param connection the Connection to remove
-   
+
    Usually this is done through the destructor of PhysicsConnections
 */
@@ -130 +130 @@
 void PhysicsEngine::tick(float dt)
 {
+  /* go through all the PhysicsInterface(s) and tick them,
+  meaning let the fields work */
   tIterator<PhysicsConnection>* itPC = this->connections->getIterator();
   PhysicsConnection* enumPC = itPC->nextElement();
@@ -135 +137 @@
     {
       enumPC->apply();
+
       enumPC = itPC->nextElement();
     }
   delete itPC;
 
-
+  /* actually tick all the PhysicsInterfaces. Move the objects around */
   tIterator<PhysicsInterface>* itPI = this->interfaces->getIterator();
   PhysicsInterface* enumPI = itPI->nextElement();
@@ -145 +148 @@
     {
       enumPI->tickPhys(dt);
+
       enumPI = itPI->nextElement();
     }

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

@@ -1 @@
-/*! 
+/*!
     \file physics_engine.h
-    \brief Definition of the ... singleton Class
-    
+    \brief Definition of the PhysicsEngine-singleton Class
+
 */
 
@@ -18 +18 @@
 
 
-//! A default singleton class.
+//! A class, that brings things into motion through Physics.
 class PhysicsEngine : public BaseObject {
 
@@ -41 +41 @@
  private:
   PhysicsEngine(void);
-  static PhysicsEngine* singletonRef;      //!< the singleton reference of the PhysicsEngine
 
-  tList<PhysicsInterface>* interfaces;     //!< a list of physically based objects
-  tList<Field>* fields;                    //!< a list of physicsl fields.
-  tList<PhysicsConnection>* connections;   //!< a list of physical connections
+ private:
+  static PhysicsEngine*         singletonRef;         //!< the singleton reference of the PhysicsEngine
+
+  tList<PhysicsInterface>*      interfaces;           //!< a list of physically based objects
+  tList<Field>*                 fields;               //!< a list of physicsl fields.
+  tList<PhysicsConnection>*     connections;          //!< a list of physical connections
 };
 

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

@@ -44 +44 @@
    this->massChildren = 0;
    this->forceSum = Vector(0, 0, 0);
+   this->bForceApplied = false;
 
    PhysicsEngine::getInstance()->addPhysicsInterface(this);
@@ -97 +98 @@
   PNode* tmp = (PNode*) objectPointer;
   this->forceSum += field->calcForce(tmp->getAbsCoor());
+  this->bForceApplied = true;
 }
 
@@ -107 +109 @@
   //  Vector acc = this->forceSum / ( this->massChildren + this->mass );
   PNode* coorTick =  (PNode*)(this->objectPointer);
-  if (coorTick)
-    coorTick->setRelCoor(coorTick->getRelCoor() + this->forceSum/this->mass * dt);
+  if (this->bForceApplied && coorTick)
+  {
+    coorTick->shiftCoor((coorTick->getVelocity()+ this->forceSum/this->mass * dt)*dt);
+
+    this->bForceApplied = false;
+  }
   this->forceSum = Vector(0,0,0);
-  // todo: introduce kinematics
 }

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

@@ -48 +48 @@
  private:
   void*          objectPointer;         //!< A Pointer to the object we handel (actually should be this)
+
+
   float          mass;                  //!< Mass of this object
   float          massChildren;          //!< Sum of the masses of the children nodes
+
   Vector         forceSum;              //!< Total central force for this tick
   Quaternion     momentumSum;           //!< Total momentum in this tick
+  bool           bForceApplied;         //!< If a force was applied to this object.
 };