Changeset 4330 in orxonox.OLD for orxonox/branches/physics/src/lib

Timestamp:

May 27, 2005, 12:31:47 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: more threading capabilities

File:

• orxonox/branches/physics/src/lib/graphics/particles/particle_system.cc (modified) (1 diff)

orxonox/branches/physics/src/lib/graphics/particles/particle_system.cc

@@ -115 +115 @@
   this->particleType = particleType;
   this->dialectCount = count;
-  if (glID != NULL)
-    delete glID;
-
-  glID = new GLuint[count];
-  for (int i = 0; i< count; i++)
-    glID[i] = 0;
-
-  glID[0] = glGenLists(count);
-  
-  material = new Material("transperencyMap");
-  material->setDiffuseMap("pictures/radialTransparency.png");
-  //  material->setTransparency(.5);
-
-  glNewList(glID[0], GL_COMPILE);
-  glBegin(GL_TRIANGLE_STRIP);
-  glTexCoord2f(1, 1);
-  glVertex3f(0.0, .5, .5);
-  glTexCoord2f(1, 0);
-  glVertex3f(0.0, -.5, .5);
-  glTexCoord2f(0, 1);
-  glVertex3f(0.0, .5, -.5);
-  glTexCoord2f(0, 0);
-  glVertex3f(0.0, -.5, -.5);
-  glEnd();
-  glEndList();
+  //  if (glID != NULL)
+  //    delete glID;
+
+  //  glID = new GLuint[count];
+  //  for (int i = 0; i< count; i++)
+  //    glID[i] = 0;
+
+  //  glID[0] = glGenLists(count);
+  if (material)
+    delete material;
+  material = NULL;
+
+  if (particleType == PARTICLE_SPRITE)
+    {
+      material = new Material("transperencyMap");
+      material->setDiffuseMap("pictures/radialTransparency.png");
+      //  material->setTransparency(.5);
+    }
 }