Changeset 5446 in orxonox.OLD for trunk/src/lib/particles/particle_system.cc
- Timestamp:
- Oct 29, 2005, 11:55:41 AM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/particles/particle_system.cc
r5445 r5446 27 27 #include "material.h" 28 28 #include "state.h" 29 #include "shell_command.h" 29 30 30 31 #include "tinyxml.h" 31 32 32 33 CREATE_FACTORY(ParticleSystem); 33 34 SHELL_COMMAND(texture, ParticleSystem, setMaterialTexture) 35 ->defaultValues(1, "maps/evil-flower.png"); 34 36 35 37 using namespace std; … … 176 178 * @param particleType the type of particles in this System 177 179 * @param count how many particles (in PARTICLE_MULTI-mode) 178 @todo this willbe different180 @todo this MUST be different 179 181 */ 180 182 void ParticleSystem::setType(PARTICLE_TYPE particleType, int count) … … 214 216 { 215 217 this->material = material; 218 } 219 220 void ParticleSystem::setMaterialTexture(const char* textureFile) 221 { 222 if (this->material != NULL) 223 this->material->setDiffuseMap(textureFile); 216 224 } 217 225
Note: See TracChangeset
for help on using the changeset viewer.