Changeset 4333 in orxonox.OLD for orxonox/branches/physics/src/subprojects/particles/framework.cc

Timestamp:

May 27, 2005, 7:40:46 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: made the framework more modular

File:

• orxonox/branches/physics/src/subprojects/particles/framework.cc (modified) (11 diffs)

orxonox/branches/physics/src/subprojects/particles/framework.cc

@@ -16 +16 @@
 #include "framework.h"
 
-#include "physics_engine.h"
-#include "particle_engine.h"
-
-#include "gui_gtk.h"
+
 #include "p_node.h"
 #include "null_parent.h"
@@ -32 +29 @@
 int verbose;
 
-int quitGui(GtkWidget* widget, void* data);
-
-
-void Framework::initModule()
-{
-  // Creating a Test Particle System
-  ParticleSystem* system = new ParticleSystem(100000, PARTICLE_SPRITE);
-
-  // Creating a Test Particle Emitter
-  ParticleEmitter* emitter = new ParticleEmitter(Vector(0 , 1, 0));
-  // Add the Flow from the Emitter into the System
-  ParticleEngine::getInstance()->addConnection(emitter, system);
-}
-
 void* Framework::mainLoop(void* tmp)
 {
@@ -60 +43 @@
       float dt = framework->tick();
 
+      NullParent::getInstance()->update(dt);
+
       // Draw the scene
       framework->draw(dt);
@@ -71 +56 @@
   glLoadIdentity(); // Reset the view
   
-  ParticleEngine::getInstance()->draw(dt);
-
+  this->moduleDraw(dt);
+  
   camera->apply();
   
@@ -85 +70 @@
   lastFrame = currFrame;
 
-  ParticleEngine::getInstance()->tick(dt);
-
-  NullParent::getInstance()->update(dt);
+  this->moduleTick(dt);
+
   return dt;
 }
@@ -161 +145 @@
             break;
           case SDLK_i:
-            ParticleEngine::getInstance()->debug();
+            //      ParticleEngine::getInstance()->debug();
             break;
           case SDLK_a:
@@ -231 +215 @@
  
 
-  initModule();
+  moduleInit();
 
   camera = new Camera();
@@ -238 +222 @@
 
   camera->setAbsCoor(Vector(10, 10, 0));
-
 }
 
@@ -254 +237 @@
   PRINT(0)("========================\n");
   PRINT(0)("h - print thisHelp\n");
-  PRINT(0)("i - state Information\n\n");
-  PRINT(0)("\n");
-
-
-}
-
-int emitterChange(GtkWidget* nonInterest, void* widget)
-{
-  Option* option = (Option*) widget;
-  const char* name = option->getTitle();
-  char* valueC = option->save();
-  float value = atof(valueC);
-
-  ParticleEmitter* tmpEmit = ParticleEngine::getInstance()->getEmitterByNumber(1);
-  if (tmpEmit)
-    {
-      if (!strcmp(name, "EmissionRate"))
-        {
-          tmpEmit->setEmissionRate(value);
-          PRINT(3)("EmissionRate set to %f\n", value);
-        }
-      else if (!strcmp(name, "Velocity"))
-        {
-          tmpEmit->setEmissionVelocity(value);
-          PRINT(3)("Velocity set to %f\n", value);
-        }
-      else if(!strcmp(name, "SpreadAngle"))
-        {
-          tmpEmit->setSpread(value);
-          PRINT(3)("SpreadAngle set to %f\n", value);
-        }
-      else if(!strcmp(name, "EmitterType"))
-        {
-          if (!strcmp(valueC, "EMITTER_DOT"))
-            tmpEmit->setType(EMITTER_DOT);
-          else if (!strcmp(valueC, "EMITTER_PLANE"))
-            tmpEmit->setType(EMITTER_PLANE);
-          else if (!strcmp(valueC, "EMITTER_CUBE"))
-            tmpEmit->setType(EMITTER_CUBE);
-          PRINT(3)("EmitterType set to %s\n", valueC);    
-        }
-      else if(!strcmp(name, "EmitterSize"))
-        {
-          tmpEmit->setSize(value);
-          PRINT(3)("EmitterSize set to %f\n", value);
-        }
-    }
-  delete valueC;
-}
-
-
-int systemChange(GtkWidget* nonInterest, void* widget)
-{
-  Option* option = (Option*) widget;
-  const char* name = option->getTitle();
-  char* valueC = option->save();
-  float value = atof(valueC);
-
-  ParticleSystem* tmpSys = ParticleEngine::getInstance()->getSystemByNumber(1);
-  if (tmpSys)
-    {
-      if (!strcmp(name, "StartRadius"))
-        {
-          tmpSys->setRadius(value, tmpSys->getEndRadius());
-          PRINT(3)("ParticleStartRadius set to %f\n", value);
-        }
-      else if (!strcmp(name, "EndRadius"))
-        {
-          tmpSys->setRadius( tmpSys->getStartRadius(), value);
-          PRINT(3)("ParticleEndRadius set to %f\n", value);
-        }
-
-      else if (!strcmp(name, "LifeSpan"))
-        {
-          tmpSys->setLifeSpan(value);
-          PRINT(3)("ParticleLifeSpan set to %f\n", value);
-        }
-
-      else if (!strcmp(name, "ConserveFactor"))
-        {
-          tmpSys->setConserve(value);
-          PRINT(3)("ParticleConserveFactor set to %f\n", value);
-        }
-
-      else if (!strcmp(name, "ParticleType"))
-        {
-          if (!strcmp(valueC, "PARTICLE_DOT"))
-            tmpSys->setType(PARTICLE_DOT);
-          else if (!strcmp(valueC, "PARTICLE_SPARK"))
-            tmpSys->setType(PARTICLE_SPARK);
-          else if (!strcmp(valueC, "PARTICLE_SPRITE"))
-            tmpSys->setType(PARTICLE_SPRITE);
-
-          PRINT(3)("ParticleType set to %s\n", valueC);
-        }
-
-      else if (!strcmp(name, "InheritSpeed"))
-        {
-          tmpSys->setInheritSpeed(value);
-          PRINT(3)("ParticleInheritSpeed set to %f\n", value);
-        }
-
-    }
-  delete valueC;
-}
-
+
+  this->moduleHelp();
+
+}
 
 int quitGui(GtkWidget* widget, void* data)
@@ -370 +251 @@
 }
 
-void* Framework::initGui(void* argv)
-{
-  Window* guiMainWindow = NULL;
-  
-  initGUI(0, NULL);
-  
-  guiMainWindow = new Window("ParticlesFUN");
-  {
-    Box* windowBox = new Box('v');
-    {
-      Frame* emitterFrame = new Frame("emitter-settings");
-      {
-        Box* emitterBox = new Box('v');
-        {
-          emitterBox->fill(new Label("EmissionRate"));
-          Slider* EmissionRate = new Slider("EmissionRate", 0, 1000);
-          EmissionRate->connectSignal("value_changed", (void*)EmissionRate, emitterChange );
-          emitterBox->fill(EmissionRate);
-          
-          emitterBox->fill(new Label("Velocity"));
-          Slider* velocity = new Slider("Velocity", 0, 2);
-          velocity->setExactness(3);
-          velocity->connectSignal("value_changed", (void*)velocity, emitterChange );
-          emitterBox->fill(velocity);
-          
-          emitterBox->fill(new Label("SpreadAngle"));
-          Slider* SpreadAngle = new Slider("SpreadAngle", 0, M_PI);
-          SpreadAngle->setExactness(3);
-          SpreadAngle->connectSignal("value_changed", (void*)SpreadAngle, emitterChange );
-          emitterBox->fill(SpreadAngle);
-
-          emitterBox->fill(new Label("EmitterType"));
-          Menu* EmitterType = new Menu("EmitterType");
-          EmitterType->addItem("EMITTER_DOT");
-          EmitterType->addItem("EMITTER_PLANE");
-          EmitterType->addItem("EMITTER_CUBE");
-          EmitterType->connectSignal("changed", (void*)EmitterType, emitterChange );      
-          emitterBox->fill(EmitterType);
-
-          emitterBox->fill(new Label("EmitterSize"));
-          Slider* EmitterSize = new Slider("EmitterSize", 0, 100);
-          EmitterSize->setExactness(1);
-          EmitterSize->connectSignal("value_changed", (void*)EmitterSize, emitterChange );
-          emitterBox->fill(EmitterSize);
-        }
-        emitterFrame->fill(emitterBox);
-      }
-      windowBox->fill(emitterFrame);
-      
-      Frame* systemFrame = new Frame("system-settings");
-      {
-        Box* systemBox = new Box('v');
-        {
-          systemBox->fill(new Label("StartRadius"));
-          Slider* StartRadius = new Slider("StartRadius", 0, 10);
-          StartRadius->setExactness(3);
-          StartRadius->connectSignal("value_changed", (void*)StartRadius, systemChange );
-          systemBox->fill(StartRadius);
-
-          systemBox->fill(new Label("EndRadius"));
-          Slider* EndRadius = new Slider("EndRadius", 0, 10);
-          EndRadius->setExactness(3);
-          EndRadius->connectSignal("value_changed", (void*)EndRadius, systemChange );
-          systemBox->fill(EndRadius);
-
-          systemBox->fill(new Label("LifeSpan"));
-          Slider* LifeSpan = new Slider("LifeSpan", 0, 10);
-          LifeSpan->setExactness(3);
-          LifeSpan->connectSignal("value_changed", (void*)LifeSpan, systemChange );
-          systemBox->fill(LifeSpan);
-          
-          systemBox->fill(new Label("ConserveFactor"));
-          Slider* ConserveFactor = new Slider("ConserveFactor", 0, 1);
-          ConserveFactor->setExactness(3);
-          ConserveFactor->connectSignal("value_changed", (void*)ConserveFactor, systemChange );
-          systemBox->fill(ConserveFactor);
-
-          systemBox->fill(new Label("ParticleType"));
-          Menu* ParticleType = new Menu("ParticleType");
-          ParticleType->addItem("PARTICLE_DOT");
-          ParticleType->addItem("PARTICLE_SPARK");
-          ParticleType->addItem("PARTICLE_SPRITE");
-          ParticleType->connectSignal("changed", (void*)ParticleType, systemChange );     
-          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);
-
-
-        }
-        systemFrame->fill(systemBox);
-      }
-      windowBox->fill(systemFrame);
-      
-      Button* quitButton = new Button("quit");
-      
-      quitButton->connectSignal("clicked", NULL, quitGui);
-      //  Window::mainWindow->connectSignal("remove", this, GuiExec::quitGui);
-      Window::mainWindow->connectSignal("destroy", NULL, quitGui);
-      
-      windowBox->fill(quitButton);
-    }
-    guiMainWindow->fill(windowBox);
-  }
-  Window::mainWindow->showall();
-  Window::mainWindow->setSize(300, 500);
-}
-
-void* Framework::mainloopGui(void* tmp)
-{
-  mainloopGUI();
-}
-
-
 
 int main(int argc, char *argv[])
@@ -494 +258 @@
   Framework* framework = Framework::getInstance();
 
-  framework->initGui((void*)argv);
+  framework->moduleInitGui();
   //  framework->mainloopGui(NULL);
 
   framework->mainLoop(NULL);
-
 
   delete framework;