Changeset 5652 in orxonox.OLD for trunk/src/lib/particles

Timestamp:

Nov 20, 2005, 6:32:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new LoadParam procedure with all NON-cycling load-options, and it works perfectly (on first sight

now going to make the same for cycling LoadOptions

Location:

trunk/src/lib/particles

Files:

• particle_emitter.cc (modified) (2 diffs)
• particle_system.cc (modified) (2 diffs)

trunk/src/lib/particles/particle_emitter.cc

@@ -22 +22 @@
 
 #include "load_param.h"
+#include "factory.h"
 #include "debug.h"
 #include "stdlibincl.h"
@@ -94 +95 @@
   static_cast<PNode*>(this)->loadParams(root);
 
-  LoadParam<ParticleEmitter>(root, "type", this, &ParticleEmitter::setType)
+  LoadParamNEW(root, "type", this, ParticleEmitter, setType)
     .describe("What type of emitter is this [dot, plane, cube, sphere].");
 
-  LoadParam<ParticleEmitter>(root, "size", this, &ParticleEmitter::setSize)
+  LoadParamNEW(root, "size", this, ParticleEmitter, setSize)
     .describe("How big the emitter is (no effect on dot-emitters)");
 
-  LoadParam<ParticleEmitter>(root, "rate", this, &ParticleEmitter::setEmissionRate)
+  LoadParamNEW(root, "rate", this, ParticleEmitter, setEmissionRate)
     .describe("How many particles should be emittet from this emitter");
 
-  LoadParam<ParticleEmitter>(root, "inherit-speed", this, &ParticleEmitter::setInheritSpeed)
+  LoadParamNEW(root, "inherit-speed", this, ParticleEmitter, setInheritSpeed)
     .describe("the extent, the speed of the emitter has on the particles");
 
-  LoadParam<ParticleEmitter>(root, "emission-velocity", this, &ParticleEmitter::setEmissionVelocity)
+  LoadParamNEW(root, "emission-velocity", this, ParticleEmitter, setEmissionVelocity)
     .describe("How fast the particles are emittet (their initial speed)");
 
-  LoadParam<ParticleEmitter>(root, "emission-momentum", this, &ParticleEmitter::setEmissionMomentum)
+  LoadParamNEW(root, "emission-momentum", this, ParticleEmitter, setEmissionMomentum)
       .describe("How fast the particles rotation is at emissiontime (their initial momentum)");
 
-  LoadParam<ParticleEmitter>(root, "spread", this, &ParticleEmitter::setSpread)
+  LoadParamNEW(root, "spread", this, ParticleEmitter, setSpread)
     .describe("The angle the particles are emitted from (angle, deviation)");
 

trunk/src/lib/particles/particle_system.cc

@@ -25 +25 @@
 
 #include "load_param.h"
-#include "compiler.h"
+#include "factory.h"
 #include "material.h"
 #include "state.h"
@@ -119 +119 @@
   static_cast<PhysicsInterface*>(this)->loadParams(root);
 
-  LoadParam<ParticleSystem>(root, "max-count", this, &ParticleSystem::setMaxCount)
+  LoadParamNEW(root, "max-count", this, ParticleSystem, setMaxCount)
       .describe("the maximal count of Particles, that can be emitted into this system");
 
   //LoadParam<ParticleSystem>(root, "type", this, &ParticleSystem::setType);
-  LoadParam<ParticleSystem>(root, "life-span", this, &ParticleSystem::setLifeSpan)
+  LoadParamNEW(root, "life-span", this, ParticleSystem, setLifeSpan)
       .describe("sets the life-span of the Particles.");
 
-  LoadParam<ParticleSystem>(root, "conserve", this, &ParticleSystem::setConserve)
-      .describe("sets the Conserve facrot of the Particles (1.0: they keep all their energy, 0.0:they keep no energy)");
-
-  LoadParam<ParticleSystem>(root, "type", this, &ParticleSystem::setType)
+  LoadParamNEW(root, "conserve", this, ParticleSystem, setConserve)
+      .describe("sets the Conserve factor of the Particles (1.0: they keep all their energy, 0.0:they keep no energy)");
+
+  LoadParamNEW(root, "type", this, ParticleSystem, setType)
       .describe("sets the type of the Particles, (dot, spark, sprite or model)");