Changeset 6653 in orxonox.OLD for trunk/src/lib/particles
- Timestamp:
- Jan 22, 2006, 4:38:59 PM (19 years ago)
- Location:
- trunk/src/lib/particles
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/particles/dot_particles.cc
r6652 r6653 28 28 29 29 30 CREATE_FACTORY(DotParticles, CL_ SPRITE_PARTICLES);30 CREATE_FACTORY(DotParticles, CL_DOT_PARTICLES); 31 31 32 32 SHELL_COMMAND(texture, DotParticles, setMaterialTexture) … … 61 61 */ 62 62 DotParticles::~DotParticles() 63 { 64 // deleting all the living Particles 65 while (this->particles) 66 { 67 Particle* tmpDelPart = this->particles; 68 this->particles = this->particles->next; 69 delete tmpDelPart; 70 } 71 72 // deleting all the dead particles 73 while (this->deadList) 74 { 75 Particle* tmpDelPart = this->deadList; 76 this->deadList = this->deadList->next; 77 delete tmpDelPart; 78 } 79 } 63 { } 80 64 81 65 /** … … 84 68 void DotParticles::init() 85 69 { 86 this->setClassID(CL_ SPRITE_PARTICLES, "DotParticles");70 this->setClassID(CL_DOT_PARTICLES, "DotParticles"); 87 71 88 72 this->material.setDiffuseMap("maps/radial-trans-noise.png"); … … 102 86 103 87 /** 104 * @brief sets the Texutre that is placed onto the particles105 * @param textureFile the Texture to load onto these DotParticles106 */107 void DotParticles::setMaterialTexture(const char* textureFile)108 {109 this->material.setDiffuseMap(textureFile);110 }111 112 /**113 88 * @brief draws all the Particles of this System 114 89 * … … 121 96 glPushAttrib(GL_ENABLE_BIT); 122 97 123 124 98 GLboolean checkLight = false; 125 99 glGetBooleanv(GL_LIGHTING, &checkLight); 126 // if (checkLight == GL_TRUE) 127 // glDisable(GL_LIGHTING); 100 if (checkLight == GL_TRUE) 101 glDisable(GL_LIGHTING); 102 128 103 glMatrixMode(GL_MODELVIEW); 129 glDepthMask(GL_FALSE);130 131 material.select();132 104 glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA); 133 105 … … 144 116 } 145 117 glEnd(); 146 glDepthMask(GL_TRUE);147 118 glPopAttrib(); 148 119 } -
trunk/src/lib/particles/model_particles.cc
r6629 r6653 61 61 */ 62 62 ModelParticles::~ModelParticles() 63 { 64 // deleting all the living Particles 65 while (this->particles) 66 { 67 Particle* tmpDelPart = this->particles; 68 this->particles = this->particles->next; 69 delete tmpDelPart; 70 } 71 72 // deleting all the dead particles 73 while (this->deadList) 74 { 75 Particle* tmpDelPart = this->deadList; 76 this->deadList = this->deadList->next; 77 delete tmpDelPart; 78 } 79 } 63 { } 80 64 81 65 /** -
trunk/src/lib/particles/spark_particles.cc
r6629 r6653 60 60 */ 61 61 SparkParticles::~SparkParticles() 62 { 63 // deleting all the living Particles 64 while (this->particles) 65 { 66 Particle* tmpDelPart = this->particles; 67 this->particles = this->particles->next; 68 delete tmpDelPart; 69 } 70 71 // deleting all the dead particles 72 while (this->deadList) 73 { 74 Particle* tmpDelPart = this->deadList; 75 this->deadList = this->deadList->next; 76 delete tmpDelPart; 77 } 78 } 62 { } 79 63 80 64 /** -
trunk/src/lib/particles/sprite_particles.cc
r6651 r6653 61 61 */ 62 62 SpriteParticles::~SpriteParticles() 63 { 64 // deleting all the living Particles 65 while (this->particles) 66 { 67 Particle* tmpDelPart = this->particles; 68 this->particles = this->particles->next; 69 delete tmpDelPart; 70 } 71 72 // deleting all the dead particles 73 while (this->deadList) 74 { 75 Particle* tmpDelPart = this->deadList; 76 this->deadList = this->deadList->next; 77 delete tmpDelPart; 78 } 79 } 63 { } 80 64 81 65 /**
Note: See TracChangeset
for help on using the changeset viewer.