Changeset 4637 in orxonox.OLD for orxonox/trunk/src/subprojects/particles/particle_fun.cc

Timestamp:

Jun 16, 2005, 1:31:24 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: particles_fun compiles again

File:

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

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

@@ -50 +50 @@
   // Creating a Test Particle System
   ParticleSystem* system = new ParticleSystem(100000, PINIT_PARTICLE_TYPE);
-  system->setRadius(PINIT_START_RADIUS, PINIT_END_RADIUS ,0 ,0);
+  system->setRadius(0, PINIT_START_RADIUS, 0 );
+  system->setRadius(1, PINIT_END_RADIUS, 0 );
   system->setLifeSpan(PINIT_LIFESPAN);
 
@@ -153 +154 @@
           PRINT(4)("EmitterSize set to %f\n", atof(value));
         }
+        else if (!strcmp(name, "InheritSpeed"))
+        {
+          tmpEmit->setInheritSpeed(atof(value));
+          PRINT(4)("ParticleInheritSpeed set to %f\n", atof(value));
+        }
     }
   delete value;
@@ -169 +175 @@
       if (!strcmp(name, "StartRadius"))
         {
-          tmpSys->setRadius(atof(value), tmpSys->getEndRadius());
+          tmpSys->setRadius(0, atof(value));
           PRINT(4)("ParticleStartRadius set to %f\n", atof(value));
         }
       else if (!strcmp(name, "EndRadius"))
         {
-          tmpSys->setRadius( tmpSys->getStartRadius(), atof(value));
+          tmpSys->setRadius( 1, atof(value));
           PRINT(4)("ParticleEndRadius set to %f\n", atof(value));
         }
@@ -186 +192 @@
       else if (!strcmp(name, "Mass"))
         {
-          tmpSys->setMass(atof(value));
+          tmpSys->setMass(0, atof(value));
           PRINT(4)("ParticleMass set to %f\n", atof(value));
         }
@@ -208 +214 @@
         }
 
-      else if (!strcmp(name, "InheritSpeed"))
-        {
-          tmpSys->setInheritSpeed(atof(value));
-          PRINT(4)("ParticleInheritSpeed set to %f\n", atof(value));
-        }
       else if (!strcmp(name, "RandomColor"))
         {
-          tmpSys->setColor((float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, 1,
-                           (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, .5,
-                           (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, 0);
+          tmpSys->setColor(0, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, 1);
+          tmpSys->setColor(.5, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, .5);
+          tmpSys->setColor(.5, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, 0);
         }
     }
@@ -300 +301 @@
           EmitterSize->redraw();
           emitterBox->fill(EmitterSize);
+
+          emitterBox->fill(new Label("InheritSpeed"));
+          Slider* InheritSpeed = new Slider("InheritSpeed", 0, 1);
+          InheritSpeed->setExactness(3);
+          InheritSpeed->connectSignal("value_changed", (void*)InheritSpeed, emitterChange );
+          emitterBox->fill(InheritSpeed);
         }
         emitterFrame->fill(emitterBox);
@@ -359 +366 @@
           systemBox->fill(ParticleType);
 
-          systemBox->fill(new Label("InheritSpeed"));
-          Slider* InheritSpeed = new Slider("InheritSpeed", 0, 1);
-          InheritSpeed->setExactness(3);
-          InheritSpeed->connectSignal("value_changed", (void*)InheritSpeed, systemChange );
-          systemBox->fill(InheritSpeed);
-
           Button* RandomColor = new Button("RandomColor");
           RandomColor->connectSignal("released", (void*)RandomColor, systemChange);