Changeset 6626 in orxonox.OLD for trunk/src/lib/particles/sprite_particles.cc

Timestamp:

Jan 20, 2006, 1:57:57 AM (18 years ago)

Author:

bensch

Message:

trunk: segfault prevention

File:

• trunk/src/lib/particles/sprite_particles.cc (modified) (2 diffs)

trunk/src/lib/particles/sprite_particles.cc

@@ -86 +86 @@
   this->setClassID(CL_SPRITE_PARTICLES, "SpriteParticles");
 
-  this->material = NULL;
+  this->material.setDiffuseMap("maps/radial-trans-noise.png");
 }
 
@@ -101 +101 @@
 }
 
-// setting properties
 /**
- * @brief sets the material to an external material
- * @param material: the material to set this material to.
- *
- * !! important if the extern material gets deleted it MUST be unregistered here or segfault !!
-*/
-void SpriteParticles::setMaterial(Material* material)
-{
-  this->material = *material;
-}
-
+ * @brief sets the Texutre that is placed onto the particles
+ * @param textureFile the Texture to load onto these SpriteParticles
+ */
 void SpriteParticles::setMaterialTexture(const char* textureFile)
 {