Changeset 5446 in orxonox.OLD for trunk/src/lib/particles

Timestamp:

Oct 29, 2005, 11:55:41 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: removed debug-stuff

Location:

trunk/src/lib/particles

Files:

• particle_system.cc (modified) (3 diffs)
• particle_system.h (modified) (1 diff)

trunk/src/lib/particles/particle_system.cc

@@ -27 +27 @@
 #include "material.h"
 #include "state.h"
+#include "shell_command.h"
 
 #include "tinyxml.h"
 
 CREATE_FACTORY(ParticleSystem);
-
+SHELL_COMMAND(texture, ParticleSystem, setMaterialTexture)
+    ->defaultValues(1, "maps/evil-flower.png");
 
 using namespace std;
@@ -176 +178 @@
  * @param particleType the type of particles in this System
  * @param count how many particles (in PARTICLE_MULTI-mode)
-   @todo this will be different
+   @todo this MUST be different
 */
 void ParticleSystem::setType(PARTICLE_TYPE particleType, int count)
@@ -214 +216 @@
 {
   this->material = material;
+}
+
+void ParticleSystem::setMaterialTexture(const char* textureFile)
+{
+  if (this->material != NULL)
+    this->material->setDiffuseMap(textureFile);
 }
 

trunk/src/lib/particles/particle_system.h

@@ -79 +79 @@
   void setType(PARTICLE_TYPE particleType, int count = 0);
   void setMaterial(Material* material);
+  void setMaterialTexture(const char* textureFile);
   void setModel(const char* modelName = NULL);
   void setLifeSpan(float lifeSpan, float randomLifeSpan = 0.0);