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

Timestamp:

May 29, 2005, 9:20:42 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: demo now with 3 different fields

File:

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

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

@@ -67 +67 @@
 
   twirl = new Twirl();
-  twirl->setMagnitude(10);
+  twirl->setMagnitude(0);
   gravity = new Gravity();
+  gravity->setMagnitude(0);
   pointGravity = new PointGravity();
+  pointGravity->setMagnitude(0);
+
+  new PhysicsConnection(system, gravity);
+  new PhysicsConnection(system, twirl);
+  new PhysicsConnection(system, pointGravity);
 }
 
@@ -175 +181 @@
         }
 
+      else if (!strcmp(name, "Mass"))
+        {
+          tmpSys->setMass(atof(value));
+          PRINT(4)("ParticleMass set to %f\n", atof(value));
+        }
+
       else if (!strcmp(name, "ConserveFactor"))
         {
@@ -215 +227 @@
 
 
-  if (!strcmp(name, "Twirl"))
-    {
-      if (static_cast<CheckButton*>(option)->isActive())
-        new PhysicsConnection(ParticleEngine::getInstance()->getSystemByNumber(1), twirl);
-      else
-        ;
+  if (!strcmp(name, "Gravity"))
+    {
+      gravity->setMagnitude(atof(value));
+    }
+
+  else if (!strcmp(name, "Twirl"))
+    {
+      twirl->setMagnitude(atof(value));
+    }
+
+  else if (!strcmp(name, "PointGravity"))
+    {
+      pointGravity->setMagnitude(atof(value));
     }
 
@@ -303 +322 @@
           systemBox->fill(EndRadius);
 
+          systemBox->fill(new Label("ParticleMass"));
+          Slider* Mass = new Slider("Mass", 0, 10);
+          Mass->setExactness(2);
+          Mass->connectSignal("value_changed", (void*)Mass, systemChange );
+          Mass->setValue(PINIT_PARTICLE_MASS);
+          Mass->redraw();
+          systemBox->fill(Mass);
+          
+
           systemBox->fill(new Label("LifeSpan"));
           Slider* LifeSpan = new Slider("LifeSpan", 0, 10);
@@ -347 +375 @@
         Box* fieldsBox = new Box('v');
         {
-          CheckButton* Twirl = new CheckButton("Twirl");
-          Twirl->connectSignal("clicked", (void*)Twirl, fieldsChange);
+          fieldsBox->fill(new Label("Gravity"));
+          Slider* Gravity = new Slider("Gravity", 0, 10);
+          Gravity->setExactness(1);
+          Gravity->connectSignal("value_changed", (void*)Gravity, fieldsChange );
+          Gravity->setValue(0);
+          Gravity->redraw();
+          fieldsBox->fill(Gravity);
+
+
+          fieldsBox->fill(new Label("Twirl"));
+          Slider* Twirl = new Slider("Twirl", 0, 10);
+          Twirl->setExactness(1);
+          Twirl->connectSignal("value_changed", (void*)Twirl, fieldsChange );
+          Twirl->setValue(0);
+          Twirl->redraw();
           fieldsBox->fill(Twirl);
+
+
+          fieldsBox->fill(new Label("PointGravity"));
+          Slider* PointGravity = new Slider("PointGravity", 0, 10);
+          PointGravity->setExactness(1);
+          PointGravity->connectSignal("value_changed", (void*)PointGravity, fieldsChange );
+          PointGravity->setValue(0);
+          PointGravity->redraw();
+          fieldsBox->fill(PointGravity);
+
         }
         fieldsFrame->fill(fieldsBox);