Changeset 5446 in orxonox.OLD for trunk/src

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: removed debug-stuff

Location:

trunk/src

Files:

• lib/particles/particle_system.cc (modified) (3 diffs)
• lib/particles/particle_system.h (modified) (1 diff)
• world_entities/weapons/test_bullet.cc (modified) (3 diffs)

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);

trunk/src/world_entities/weapons/test_bullet.cc

@@ -64 +64 @@
 TestBullet::~TestBullet ()
 {
-//  delete this->emitter;
+  // delete this->emitter;
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
@@ -72 +72 @@
       delete TestBullet::explosionParticles;
     TestBullet::explosionParticles = NULL;
-    printf("-------------------\n");
   }
 
@@ -86 +85 @@
   {
     ClassList::debug(3, CL_PARTICLE_SYSTEM);
-    TestBullet::explosionParticles = new ParticleSystem(10000, PARTICLE_SPRITE);
+    TestBullet::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
     TestBullet::explosionParticles->setName("TestBulletTrailParticles");
-    TestBullet::explosionParticles->setLifeSpan(.5);
+    TestBullet::explosionParticles->setLifeSpan(.5, .3);
     TestBullet::explosionParticles->setRadius(0.0, .5);
     TestBullet::explosionParticles->setRadius(0.5, 2.0);
-    TestBullet::explosionParticles->setRadius(0.0, 0.0);
+    TestBullet::explosionParticles->setRadius(1.0, 5.0);
     TestBullet::explosionParticles->setColor(0.0, 1,0,0,.7);
     TestBullet::explosionParticles->setColor(0.5, .8,.8,0,.5);
-    TestBullet::explosionParticles->setColor(1.0, .5,.5,.5,.0);
-    printf("::::::::::::::::::::::::::::\n");
+    TestBullet::explosionParticles->setColor(1.0, .7,.7,.7,.0);
   }