Changeset 4379 in orxonox.OLD

Timestamp:

May 29, 2005, 2:41:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: preparing to add fields to the particles-demo

File:

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

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

@@ -35 +35 @@
 #define PINIT_PARTICLE_MASS          1.0
 
+
+Field* twirl;
+Field* gravity;
+Field* pointGravity;
+
 void Framework::moduleInit(int argc, char** argv)
 {
@@ -55 +60 @@
   emitter->setType(PINIT_EMITTER_TYPE);
   emitter->setSize(PINIT_EMITTER_SIZE);
+  emitter->setAbsCoor(Vector(3,0,0));
   // 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);
+  twirl = new Twirl();
+  twirl->setMagnitude(10);
+  gravity = new Gravity();
+  pointGravity = new PointGravity();
 }
 
@@ -200 +207 @@
 }
 
+int fieldsChange(GtkWidget* nonInterest, void* widget)
+{
+  Option* option = (Option*) widget;
+  const char* name = option->getTitle();
+  char* value = option->save();
+
+
+  if (!strcmp(name, "Twirl"))
+    {
+      if (static_cast<CheckButton*>(option)->isActive())
+        new PhysicsConnection(ParticleEngine::getInstance()->getSystemByNumber(1), twirl);
+      else
+        ;
+    }
+
+}
 
 void Framework::moduleInitGui(int argc, char** argv)
@@ -209 +232 @@
   guiMainWindow = new Window("ParticlesFUN");
   {
-    Box* windowBox = new Box('v');
+    Box* windowBox = new Box('h');
     {
       Frame* emitterFrame = new Frame("emitter-settings");
@@ -318 +341 @@
       }
       windowBox->fill(systemFrame);
+
+      Frame* fieldsFrame = new Frame("Field-Settings");
+      {
+        Box* fieldsBox = new Box('v');
+        {
+          CheckButton* Twirl = new CheckButton("Twirl");
+          Twirl->connectSignal("clicked", (void*)Twirl, fieldsChange);
+          fieldsBox->fill(Twirl);
+        }
+        fieldsFrame->fill(fieldsBox);
+      }
+      windowBox->fill(fieldsFrame);
       
       Button* quitButton = new Button("quit");