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

Timestamp:

May 27, 2005, 12:31:47 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: more threading capabilities

File:

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

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

@@ -33 +33 @@
 int verbose;
 
+pthread_mutex_t mutex;
+
+
+
 void Framework::initModule()
 {
@@ -52 +56 @@
 }
 
-bool Framework::mainLoop()
-{
+void* Framework::mainLoop(void* tmp)
+{
+  Framework* framework = Framework::getInstance();
   while(true)
     {
       // keyhandler returns false if sdl gets quit by some event
-      if (!this->keyHandler())
-        return false;
+      if (!framework->keyHandler())
+        pthread_exit(NULL);
 
       // tick the scene
-      float dt = this->tick();
+      float dt = framework->tick();
 
       // Draw the scene
-      this->draw(dt);
+      pthread_mutex_lock (&mutex); 
+      framework->draw(dt);
+      pthread_mutex_unlock (&mutex);
     }
 }
@@ -174 +181 @@
             this->printHelp();
             break;
-
-          case SDLK_1:
-            {
-              ParticleEmitter* tmpEmit = ParticleEngine::getInstance()->getEmitterByNumber(1);
-              if (tmpEmit)
-                {
-                  tmpEmit->setEmissionRate(tmpEmit->getEmissionRate() +1.0);
-                  PRINT(3)("emissionRate set to %f\n", tmpEmit->getEmissionRate());
-                }
-            }
-            break;
-          case SDLK_2:
-            {
-              ParticleEmitter* tmpEmit = ParticleEngine::getInstance()->getEmitterByNumber(1);
-              if (tmpEmit)
-                {
-                  tmpEmit->setEmissionRate(tmpEmit->getEmissionRate() -1.0);
-                  PRINT(3)("emissionRate set to %f\n", tmpEmit->getEmissionRate());
-                }
-            }
-            break;
-          case SDLK_3:
-            {
-              ParticleEmitter* tmpEmit = ParticleEngine::getInstance()->getEmitterByNumber(1);
-              if (tmpEmit)
-                {
-                  tmpEmit->setEmissionVelocity(tmpEmit->getEmissionVelocity() -.01);
-                  PRINT(3)("emissionVelocity set to %f\n", tmpEmit->getEmissionVelocity());
-                }
-            }
-            break;
-          case SDLK_4:
-            {
-              ParticleEmitter* tmpEmit = ParticleEngine::getInstance()->getEmitterByNumber(1);
-              if (tmpEmit)
-                {
-                  tmpEmit->setEmissionVelocity(tmpEmit->getEmissionVelocity() + .01);
-                  PRINT(3)("emissionVelocity set to %f\n", tmpEmit->getEmissionVelocity());
-                }
-            }
-            break;
-          case SDLK_5:
-            {
-              ParticleEmitter* tmpEmit = ParticleEngine::getInstance()->getEmitterByNumber(1);
-              if (tmpEmit)
-                {
-                  tmpEmit->setSpread(tmpEmit->getSpread() +.1);
-                  PRINT(3)("emissionSpreadAngle set to %f\n", tmpEmit->getSpread());
-                }
-            }
-            break;
-          case SDLK_6:
-            {
-              ParticleEmitter* tmpEmit = ParticleEngine::getInstance()->getEmitterByNumber(1);
-              if (tmpEmit)
-                {
-                  tmpEmit->setSpread(tmpEmit->getSpread() -.1);
-                  PRINT(3)("emissionSpreadAngle set to %f\n", tmpEmit->getSpread());
-                }
-            }
-            break;
-          case SDLK_7:
-            {
-              ParticleEmitter* tmpEmit = ParticleEngine::getInstance()->getEmitterByNumber(1);
-              if (tmpEmit)
-                {
-                  tmpEmit->setSize(tmpEmit->getSize() - 1.0);
-                  PRINT(3)("EmitterSize set to %f\n", tmpEmit->getSize());
-                }
-            }
-            break;
-          case SDLK_8:
-            {
-              ParticleEmitter* tmpEmit = ParticleEngine::getInstance()->getEmitterByNumber(1);
-              if (tmpEmit)
-                {
-                  tmpEmit->setSize(tmpEmit->getSize() +1.0);
-                  PRINT(3)("EmitterSize set to %f\n", tmpEmit->getSize());
-                }
-            }
-            break;
-          case SDLK_9:
-            {
-              ParticleEmitter* tmpEmit = ParticleEngine::getInstance()->getEmitterByNumber(1);
-              if (tmpEmit)
-                {
-                  if (tmpEmit->getType() == EMITTER_DOT)
-                    tmpEmit->setType(EMITTER_PLANE);
-                  else if (tmpEmit->getType() == EMITTER_PLANE)
-                    tmpEmit->setType(EMITTER_CUBE);
-                  else if (tmpEmit->getType() == EMITTER_CUBE)
-                    tmpEmit->setType(EMITTER_DOT);
-                  PRINT(3)("EmitterType set to %d\n", tmpEmit->getType());
-                }
-            }
-            break;
-
           }
         break;
@@ -347 +257 @@
   PRINT(0)("h - print thisHelp\n");
   PRINT(0)("i - state Information\n\n");
-  PRINT(0)("Emitter Properties\n");
-  PRINT(0)("1,2 - increase/decrease emissionRate\n");
-  PRINT(0)("3,4 - increase/decrease emission velocity\n");
-  PRINT(0)("5,6 - increase/decrease spread angle\n");
-  PRINT(0)("7,8 - increase-decrease emitter-size\n");
-  PRINT(0)("9 - swap emitterType\n");
   PRINT(0)("\n");
 
@@ -358 +262 @@
 }
 
-int changeOption(GtkWidget* nonInterest, void* widget)
+int emitterChange(GtkWidget* nonInterest, void* widget)
 {
   Option* option = (Option*) widget;
@@ -399 +303 @@
         }
     }
+  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);
@@ -435 +349 @@
             tmpSys->setType(PARTICLE_SPRITE);
 
-          PRINT(3)("ParticleType set to %f\n", valueC);
+          PRINT(3)("ParticleType set to %s\n", valueC);
         }
 
@@ -445 +359 @@
 
     }
-
   delete valueC;
 }
 
+
+int quitGui(GtkWidget* widget, void* data)
+{
+#ifdef HAVE_GTK2
+  gtk_main_quit();
+  while(gtk_events_pending()) gtk_main_iteration();
+#endif /* HAVE_GTK2 */
+}
 
 void* Framework::initGui(void* argv)
@@ -466 +387 @@
           emitterBox->fill(new Label("EmissionRate"));
           Slider* EmissionRate = new Slider("EmissionRate", 0, 1000);
-          EmissionRate->connectSignal("value_changed", (void*)EmissionRate, changeOption );
+          EmissionRate->connectSignal("value_changed", (void*)EmissionRate, emitterChange );
           emitterBox->fill(EmissionRate);
           
@@ -472 +393 @@
           Slider* velocity = new Slider("Velocity", 0, 2);
           velocity->setExactness(3);
-          velocity->connectSignal("value_changed", (void*)velocity, changeOption );
+          velocity->connectSignal("value_changed", (void*)velocity, emitterChange );
           emitterBox->fill(velocity);
           
@@ -478 +399 @@
           Slider* SpreadAngle = new Slider("SpreadAngle", 0, M_PI);
           SpreadAngle->setExactness(3);
-          SpreadAngle->connectSignal("value_changed", (void*)SpreadAngle, changeOption );
+          SpreadAngle->connectSignal("value_changed", (void*)SpreadAngle, emitterChange );
           emitterBox->fill(SpreadAngle);
 
@@ -486 +407 @@
           EmitterType->addItem("EMITTER_PLANE");
           EmitterType->addItem("EMITTER_CUBE");
-          EmitterType->connectSignal("changed", (void*)EmitterType, changeOption );       
+          EmitterType->connectSignal("changed", (void*)EmitterType, emitterChange );      
           emitterBox->fill(EmitterType);
 
@@ -492 +413 @@
           Slider* EmitterSize = new Slider("EmitterSize", 0, 100);
           EmitterSize->setExactness(1);
-          EmitterSize->connectSignal("value_changed", (void*)EmitterSize, changeOption );
+          EmitterSize->connectSignal("value_changed", (void*)EmitterSize, emitterChange );
           emitterBox->fill(EmitterSize);
         }
@@ -506 +427 @@
           Slider* StartRadius = new Slider("StartRadius", 0, 10);
           StartRadius->setExactness(3);
-          StartRadius->connectSignal("value_changed", (void*)StartRadius, changeOption );
+          StartRadius->connectSignal("value_changed", (void*)StartRadius, systemChange );
           systemBox->fill(StartRadius);
 
@@ -512 +433 @@
           Slider* EndRadius = new Slider("EndRadius", 0, 10);
           EndRadius->setExactness(3);
-          EndRadius->connectSignal("value_changed", (void*)EndRadius, changeOption );
+          EndRadius->connectSignal("value_changed", (void*)EndRadius, systemChange );
           systemBox->fill(EndRadius);
 
@@ -518 +439 @@
           Slider* LifeSpan = new Slider("LifeSpan", 0, 10);
           LifeSpan->setExactness(3);
-          LifeSpan->connectSignal("value_changed", (void*)LifeSpan, changeOption );
+          LifeSpan->connectSignal("value_changed", (void*)LifeSpan, systemChange );
           systemBox->fill(LifeSpan);
           
@@ -524 +445 @@
           Slider* ConserveFactor = new Slider("ConserveFactor", 0, 1);
           ConserveFactor->setExactness(3);
-          ConserveFactor->connectSignal("value_changed", (void*)ConserveFactor, changeOption );
+          ConserveFactor->connectSignal("value_changed", (void*)ConserveFactor, systemChange );
           systemBox->fill(ConserveFactor);
 
@@ -532 +453 @@
           ParticleType->addItem("PARTICLE_SPARK");
           ParticleType->addItem("PARTICLE_SPRITE");
-          ParticleType->connectSignal("changed", (void*)ParticleType, changeOption );     
+          ParticleType->connectSignal("changed", (void*)ParticleType, systemChange );     
           systemBox->fill(ParticleType);
           
@@ -538 +459 @@
           Slider* InheritSpeed = new Slider("InheritSpeed", 0, 1);
           InheritSpeed->setExactness(3);
-          InheritSpeed->connectSignal("value_changed", (void*)InheritSpeed, changeOption );
+          InheritSpeed->connectSignal("value_changed", (void*)InheritSpeed, systemChange );
           systemBox->fill(InheritSpeed);
 
@@ -549 +470 @@
       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);
@@ -556 +480 @@
   Window::mainWindow->showall();
   Window::mainWindow->setSize(300, 500);
+}
+
+void* Framework::mainloopGui(void* tmp)
+{
   mainloopGUI();
 }
@@ -565 +493 @@
   verbose = 3;
   pthread_t guiThread;
+  pthread_t openglThread;
+  pthread_attr_t attr;
+  int status;
+  
+  pthread_mutex_init(&mutex, NULL);
+  
+  /* Create threads to perform the dotproduct  */
+  pthread_attr_init(&attr);
+  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+
+
+
 
   Framework* framework = Framework::getInstance();
 
-  pthread_create(&guiThread, NULL, Framework::initGui,(void*) argv);
+  framework->initGui((void*)argv);
+  pthread_create(&guiThread, &attr, Framework::mainloopGui ,(void*) argv);
   //  framework->initGui(argv);
 
-  framework->mainLoop();
+  pthread_create(&openglThread, &attr, Framework::mainLoop, NULL);
+
+  pthread_attr_destroy(&attr);
+
+  pthread_join( guiThread, (void **)&status);   
+  pthread_join( openglThread, (void **)&status);        
 
   delete framework;