Changeset 4396 in orxonox.OLD for orxonox/trunk

Timestamp:

May 30, 2005, 3:27:36 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now Objects should be affected by the PhysicsEngine too

Location:

orxonox/trunk/src

Files:

• lib/graphics/particles/particle_system.h (modified) (1 diff)
• lib/physics/fields/gravity.cc (modified) (1 diff)
• lib/physics/physics_engine.cc (modified) (1 diff)
• lib/physics/physics_interface.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (4 diffs)
• story_entities/world.h (modified) (2 diffs)

orxonox/trunk/src/lib/graphics/particles/particle_system.h

@@ -99 +99 @@
 
   virtual void applyField(Field* field);
+  virtual void tickPhys(float dt) {};
 
   void addParticle(const Vector& position, const Vector& velocity, unsigned int data = 0);

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

@@ -47 +47 @@
 Vector Gravity::calcForce(const Vector& data) const
 {
-  return /*(this->getAbsDir().apply(Vector(0,1,0)))*/ Vector(0,-1,0) * this->getMagnitude();
+  return Vector(0,-1,0) * this->getMagnitude();
 }
 

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

@@ -140 +140 @@
 void PhysicsEngine::tick(float dt)
 {
-  tIterator<PhysicsConnection>* iterator = this->connections->getIterator();
-  PhysicsConnection* enumConn = iterator->nextElement();
-  while (enumConn)
+  tIterator<PhysicsConnection>* itPC = this->connections->getIterator();
+  PhysicsConnection* enumPC = itPC->nextElement();
+  while (enumPC)
     {
-      enumConn->apply();
-      enumConn = iterator->nextElement();
+      enumPC->apply();
+      enumPC = itPC->nextElement();
     }
-  delete iterator;
+  delete itPC;
+
+
+  tIterator<PhysicsInterface>* itPI = this->interfaces->getIterator();
+  PhysicsInterface* enumPI = itPI->nextElement();
+  while (enumPI)
+    {
+      enumPI->tickPhys(dt);
+      enumPI = itPI->nextElement();
+    }
+  delete itPI;
 }
 

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

@@ -39 +39 @@
 {
   //   this->setClassName ("PhysicsInterface");
-   this->mass = 0;
+   this->mass = 1;
    this->massChildren = 0;
    this->forceSum = Vector(0, 0, 0);
@@ -90 +90 @@
 void PhysicsInterface::applyField(Field* field)
 {
-  //  this->forceSum += force;
+  this->forceSum += field->calcForce(dynamic_cast<PNode*>(this)->getAbsCoor());
 }
 
@@ -96 +96 @@
 {
   Vector acc = this->forceSum / ( this->massChildren + this->mass );
+  PNode* coorTick =  (PNode*) this;
+  coorTick->setRelCoor(coorTick->getRelCoor() + (this->forceSum / this->mass * dt));
+
+  this->forceSum = Vector(0,0,0);
   // todo: introduce kinematics
 }

orxonox/trunk/src/story_entities/world.cc

@@ -48 +48 @@
 #include "graphics_engine.h"
 #include "physics_engine.h"
+#include "fields.h"
 
 #include "command_node.h"
@@ -181 +182 @@
   TextEngine::getInstance()->flush();
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
+  delete PhysicsEngine::getInstance();
   //delete garbagecollecor
   //delete animator
@@ -473 +475 @@
   emitter->setParent(this->localPlayer);
   emitter->setRelCoor(Vector(-3,0,0));
+
+  Field* gravity = new Gravity();
+  gravity->setMagnitude(1000);
+  //  gravity->setParent(this->localCamera->getTarget());
   
   // Add the Flow from the Emitter into the System
   particleEngine->addConnection(emitter, system);
 
+  new PhysicsConnection(system, gravity);
+    new PhysicsConnection(this->localPlayer, gravity);
+  
 
   WorldEntity* testEntity = new TestEntity();
@@ -1002 +1011 @@
       AnimationPlayer::getInstance()->tick(this->dtS);
 
+      PhysicsEngine::getInstance()->tick(this->dtS);
+
+
       particleEngine->tick(this->dtS);
       this->garbageCollector->tick(this->dtS);

orxonox/trunk/src/story_entities/world.h

@@ -16 +16 @@
 class TrackManager;
 class Camera;
+class Player;
 class PNode;
 class GLMenuImageScreen;
@@ -123 +124 @@
   GLuint objectList;                  //!< temporary: \todo this will be ereased soon
   tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
-  WorldEntity* localPlayer;           //!< The Player, you fly through the level.
+  Player* localPlayer;                //!< The Player, you fly through the level.
   PilotNode* pilotNode;               //!< THe pilot node to fly with the mouse