Changeset 4378 in orxonox.OLD for orxonox/trunk/src/subprojects

Timestamp:

May 29, 2005, 2:02:56 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: applying force works for particle-systems again

File:

• orxonox/trunk/src/subprojects/particles/particle_fun.cc (modified) (5 diffs)

orxonox/trunk/src/subprojects/particles/particle_fun.cc

@@ -20 +20 @@
 #include "physics_engine.h"
 #include "particle_engine.h"
+#include "fields.h"
 
 #define PINIT_EMISSION_RATE          50
@@ -32 +33 @@
 #define PINIT_PARTICLE_TYPE          PARTICLE_SPRITE
 #define PINIT_INHERIT_SPEED          0.0
-
+#define PINIT_PARTICLE_MASS          1.0
 
 void Framework::moduleInit(int argc, char** argv)
 {
   verbose = 5;
+  ParticleEngine::getInstance();
+  PhysicsEngine::getInstance();
+
 
   // Creating a Test Particle System
@@ -53 +57 @@
   // Add the Flow from the Emitter into the System
   ParticleEngine::getInstance()->addConnection(emitter, system);
+
+
+  Field* twirl = new Twirl();
+  twirl->setMagnitude(.1);
+  new PhysicsConnection(system, twirl);
 }
 
@@ -71 +80 @@
 void Framework::moduleTick(float dt)
 {
+  PhysicsEngine::getInstance()->tick(dt);
   ParticleEngine::getInstance()->tick(dt);
 }
@@ -85 +95 @@
   PRINT(0)("i - Particle-state Information\n\n");
   PRINT(0)("\n");
-
 }