Changeset 4183 in orxonox.OLD for orxonox/branches/physics/src/story_entities/world.cc

Timestamp:

May 14, 2005, 2:50:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: physicsEngine works for particles

File:

• orxonox/branches/physics/src/story_entities/world.cc (modified) (5 diffs)

orxonox/branches/physics/src/story_entities/world.cc

@@ -48 +48 @@
 
 #include "animation3d.h"
+#include "physics_engine.h"
+#include "gravity.h"
 
 #include "substring.h"
@@ -207 +209 @@
   TextEngine::getInstance()->flush();
 
+  delete PhysicsEngine::getInstance();
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
   //delete garbagecollecor
@@ -255 +258 @@
 
   AnimationPlayer::getInstance(); // initializes the animationPlayer
+  PhysicsEngine::getInstance();
 
   this->localCamera = new Camera();
@@ -496 +500 @@
   emitter->setParent(this->localPlayer);
   
+  Gravity* gravity = new Gravity();
+  gravity->setMagnitude(0.001);
+  new PhysicsConnection(system, gravity);
+
   particleEngine->addConnection(emitter, system);
 }
@@ -1145 +1153 @@
 
       AnimationPlayer::getInstance()->tick(this->dtS);
+      PhysicsEngine::getInstance()->tick(this->dtS);
+
       particleEngine->tick(this->dtS);
     }