Changeset 4726 in orxonox.OLD for orxonox/trunk/src/lib/particles/particle_system.cc

Timestamp:

Jun 28, 2005, 10:33:14 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more loading procedures, fixed small bugs in loadparam

File:

• orxonox/trunk/src/lib/particles/particle_system.cc (modified) (6 diffs)

orxonox/trunk/src/lib/particles/particle_system.cc

@@ -127 +127 @@
 
   LoadParam<ParticleSystem>(root, "type", this, &ParticleSystem::setType)
-      .describe("sets the type of the Particles, (DOT, SPARK, SPRITE or MODEL)");
-
-  LoadParam<ParticleSystem>(root, "model", this, &ParticleSystem::setModel)
-      .describe("sets a model to be loaded on top of this System (also sets type to Model)");
+      .describe("sets the type of the Particles, (dot, spark, sprite or model)");
 
   // PER-PARTICLE-ATTRIBUTES:
@@ -149 +146 @@
 void ParticleSystem::setType(const char* particleType)
 {
-  if (strcmp(particleType, "DOTS"))
+  if (!strcmp(particleType, "dot"))
     this->setType(PARTICLE_DOT);
-  else if (strcmp(particleType, "SPARKS"))
+  else if(!strcmp(particleType, "spark"))
     this->setType(PARTICLE_SPARK);
-  else if (strcmp(particleType, "MODELS"))
+  else if(!strcmp(particleType, "model"))
     this->setType(PARTICLE_MODEL);
   else // if (strcmp(particleType, "SPRITE"))
@@ -187 +184 @@
       //  material->setTransparency(.5);
         break;
-      case PARTICLE_MODEL:
-        if (!this->model)
-        {
-          PRINTF(2)("Model not loaded yet, please do this through ParticleSystem::loadModel()");
-          this->setType(PARTICLE_SPRITE);
-        }
-        break;
-    }
+  }
 }
 
@@ -207 +197 @@
 {
   this->material = material;
-}
-
-/**
- * sets a Model to the Particles
- * @param modelName the Name of the Model to load
- */
-void ParticleSystem::setModel(const char* modelName)
-{
-  if (this->model)
-    ResourceManager::getInstance()->unload(this->model);
-  if (modelName)
-  {
-    this->model = (Model*)ResourceManager::getInstance()->load(modelName, OBJ, RP_LEVEL);
-    this->setType(PARTICLE_MODEL);
-  }
-  else
-  {
-    this->model = NULL;
-    this->setType(PARTICLE_SPRITE);
-  }
 }
 
@@ -505 +475 @@
           drawPart = drawPart->next;
         }
+        else
+          printf("no model loaded onto ParticleSystem-%s\n", this->getName());
       }
       break;
@@ -595 +567 @@
 void ParticleSystem::debug(void) const
 {
-  PRINT(0)("  ParticleSystem %s\n", this->getName());
+  PRINT(0)("  ParticleSystem %s, type: ", this->getName());
+  {
+      if (this->particleType == PARTICLE_MODEL)
+        PRINT(0)("model");
+      else if (this->particleType == PARTICLE_SPRITE)
+        PRINT(0)("sprite");
+      else if (this->particleType == PARTICLE_DOT)
+        PRINT(0)("dot");
+      else if (this->particleType == PARTICLE_SPARK)
+        PRINT(0)("spark");
+
+      PRINT(0)("\n");
+  }
+
   PRINT(0)("  ParticleCount: %d, maximumCount: %d :: filled %d%%\n", this->count, this->maxCount, 100*this->count/this->maxCount);
   if (deadList)