Changeset 7221 in orxonox.OLD for trunk/src/lib/particles
- Timestamp:
- Mar 15, 2006, 3:10:45 PM (19 years ago)
- Location:
- trunk/src/lib/particles
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/particles/dot_particles.h
r6652 r7221 21 21 virtual void loadParams(const TiXmlElement* root); 22 22 23 void setMaterialTexture(const char*textureFile);23 void setMaterialTexture(const std::string& textureFile); 24 24 25 25 /** @returns the Material that lies on this particles */ -
trunk/src/lib/particles/model_particles.cc
r7198 r7221 89 89 * @param textureFile the Texture to load onto these ModelParticles 90 90 */ 91 void ModelParticles::setMaterialTexture(const char*textureFile)91 void ModelParticles::setMaterialTexture(const std::string& textureFile) 92 92 { 93 93 this->material.setDiffuseMap(textureFile); -
trunk/src/lib/particles/model_particles.h
r6629 r7221 20 20 virtual void loadParams(const TiXmlElement* root); 21 21 22 void setMaterialTexture(const char*textureFile);22 void setMaterialTexture(const std::string& textureFile); 23 23 24 24 /** @returns the Material that lies on this particles */ -
trunk/src/lib/particles/particle_system.cc
r7199 r7221 485 485 void ParticleSystem::debug() const 486 486 { 487 PRINT(0)(" ParticleCount: %d emitters: %d, maximumCount: %d :: filled %d%%\n", this->count, this->emitters.size(), this->maxCount, 100*this->count/this->maxCount);487 PRINT(0)(" ParticleCount: %d emitters: %d, maximumCount: %d :: filled %d%%\n", this->count, this->emitters.size(), this->maxCount, ((this->maxCount!=0)?100*this->count/this->maxCount:0)); 488 488 if (deadList) 489 489 { -
trunk/src/lib/particles/spark_particles.cc
r7193 r7221 68 68 { 69 69 this->setClassID(CL_SPARK_PARTICLES, "SparkParticles"); 70 71 this->material = NULL;72 70 } 73 71 -
trunk/src/lib/particles/sprite_particles.cc
r7198 r7221 89 89 * @param textureFile the Texture to load onto these SpriteParticles 90 90 */ 91 void SpriteParticles::setMaterialTexture(const char*textureFile)91 void SpriteParticles::setMaterialTexture(const std::string& textureFile) 92 92 { 93 93 this->material.setDiffuseMap(textureFile); -
trunk/src/lib/particles/sprite_particles.h
r6626 r7221 21 21 virtual void loadParams(const TiXmlElement* root); 22 22 23 void setMaterialTexture(const char*textureFile);23 void setMaterialTexture(const std::string& textureFile); 24 24 25 25 /** @returns the Material that lies on this particles */
Note: See TracChangeset
for help on using the changeset viewer.