Changeset 4378 in orxonox.OLD for orxonox/trunk

Timestamp:

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

Author:

bensch

Message:

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

Location:

orxonox/trunk/src

Files:

• lib/graphics/particles/particle_system.cc (modified) (3 diffs)
• lib/graphics/particles/particle_system.h (modified) (2 diffs)
• lib/physics/physics_connection.cc (modified) (2 diffs)
• lib/physics/physics_engine.cc (modified) (1 diff)
• lib/physics/physics_engine.h (modified) (2 diffs)
• subprojects/particles/particle_fun.cc (modified) (5 diffs)

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

@@ -56 +56 @@
   this->setType(type, 1);
   this->setColor(1.0,1.0,1.0,1.0, .5,.5,.5,.5, .0,.0,.0,.0);
+  this->setMass(1.0, 0.0);
   ParticleEngine::getInstance()->addSystem(this);
 }
@@ -182 +183 @@
 
 /**
+   \brief sets the initial mass of any particle
+*/
+void ParticleSystem::setMass(float mass, float randomMass)
+{
+  this->initialMass = mass;
+  this->randomInitialMass = randomMass;
+}
+
+/**
    \brief sets the conserve Factor of newly created particles
 */
@@ -231 +241 @@
   while (likely(tickPart != NULL))
     {
+      // applying force to the System.
+      tickPart->velocity += tickPart->extForce * tickPart->mass;
+
+      // rendering new position.
       tickPart->position = tickPart->position + tickPart->velocity * dt;
       tickPart->radius += tickPart->radiusIt * dt;
-
-      // applying force to the System.
-      tickPart->velocity += tickPart->extForce * tickPart->mass;
+      
       tickPart->extForce = Vector(0,0,0);
 

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

@@ -74 +74 @@
                  float randomStartRadius = 0.0, float randomEndRadius = 0.0);
   void setConserve(float conserve);
-  void setMass(float mass, float randomMass);
+  void setMass(float mass, float randomMass = 0.0);
 
   void setColor(GLfloat br, GLfloat bg, GLfloat bb, GLfloat ba,
@@ -97 +97 @@
   inline float getMass(void) const { return this->initialMass; };
 
-  void applyField(Field* field, float dt);
+  virtual void applyField(Field* field, float dt);
 
   void tick(float dt);

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

@@ -26 +26 @@
 using namespace std;
 
-
-
 PhysicsConnection::PhysicsConnection(PhysicsInterface* subject, Field* field)
 {
@@ -53 +51 @@
 void PhysicsConnection::apply(const float& dt) const
 {
-  switch(this->type)
-    {
-    case PCON_PhysIField:
-      
-      break;
-
-    case PCON_PhysIPhysI:
+  if (likely(this->type == PCON_PhysIField))
       this->subject->applyField(this->field, dt);
-      break;
-    }
+  else ;
 }

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

@@ -100 +100 @@
   delete iterator;
 }
+
+
+
+/**
+   \brief print out interesting debug information of this class
+*/
+void PhysicsEngine::debug(void) const
+{
+  PRINT(0)("====================================\n");
+  PRINT(0)("= Physics-Engine debug information =\n");
+  PRINT(0)("====================================\n");
+  PRINT(0)(" reference: %p\n", this);
+  PRINT(0)(" numbers of Connections: %d\n", this->connections->getSize());
+
+  PRINT(0)("==============================PHYS==\n");
+}

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

@@ -29 +29 @@
   void tick(float dt);
 
+  void debug(void) const;
+
  private:
   PhysicsEngine(void);
@@ -34 +36 @@
 
   tList<PhysicsConnection>* connections;
-
-  
 };
 

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");
-
 }