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

Timestamp:

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

Author:

bensch

Message:

trunk: segfault prevention

Location:

trunk/src/lib/particles

Files:

• particle_system.cc (modified) (1 diff)
• spark_particles.cc (modified) (3 diffs)
• sprite_particles.cc (modified) (2 diffs)
• sprite_particles.h (modified) (1 diff)

trunk/src/lib/particles/particle_system.cc

@@ -33 +33 @@
 
 using namespace std;
-
 /**
  *  standard constructor

trunk/src/lib/particles/spark_particles.cc

@@ -28 +28 @@
 
 
-CREATE_FACTORY(SparkParticles, CL_SPARK_PARTICLES);
 
 using namespace std;
+
+CREATE_FACTORY(SparkParticles, CL_SPARK_PARTICLES);
 
 /**
@@ -106 +107 @@
 void SparkParticles::draw() const
 {
+  exit(-1);
   glPushAttrib(GL_ENABLE_BIT);
 
@@ -115 +117 @@
   glEnable(GL_LINE_SMOOTH);
   glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
 
   glBegin(GL_LINES);

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

trunk/src/lib/particles/sprite_particles.h

@@ -21 +21 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void setMaterial(Material* material);
   void setMaterialTexture(const char* textureFile);