Changeset 3946 in orxonox.OLD

Timestamp:

Apr 24, 2005, 7:22:17 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: now particles are transparent, but the loadscreen does not look good anymore

Location:

orxonox/branches/particleEngine/src/lib/graphics

Files:

• importer/material.cc (modified) (1 diff)
• importer/texture.cc (modified) (3 diffs)
• particles/particle_system.cc (modified) (4 diffs)

orxonox/branches/particleEngine/src/lib/graphics/importer/material.cc

@@ -88 +88 @@
   
   // setting the transparency
-  if (this->transparency == 1.0)
-    {
-      glDisable(GL_BLEND);
-    }
-  else
+  if (this->transparency < 1.0)
     {
       glEnable(GL_BLEND);
       glColor4f(1.0f, 1.0f, 1.0f, this->transparency);
       glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    }
+  else
+    {
+      glDisable(GL_BLEND);
+      glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
 

orxonox/branches/particleEngine/src/lib/graphics/importer/texture.cc

@@ -119 +119 @@
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-      /*      glTexImage2D(GL_TEXTURE_2D,
+      glTexImage2D(GL_TEXTURE_2D,
                    0,
                    GL_RGBA,
@@ -127 +127 @@
                    GL_UNSIGNED_BYTE,
                    image->pixels);
-      */
-      gluBuild2DMipmaps(GL_TEXTURE_2D,
+      
+      /*gluBuild2DMipmaps(GL_TEXTURE_2D,
                         3,
                         w,
@@ -135 +135 @@
                         GL_UNSIGNED_BYTE,
                         image->pixels);
-
+      */
       SDL_FreeSurface(image); /* No longer needed */
       

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

@@ -96 +96 @@
   
   material = new Material("transperencyMap");
-  material->setDiffuseMap("pictures/radialTransparency.jpg");
-  
+  material->setDiffuseMap("pictures/radialTransparency.tga");
+  //  material->setTransparency(.5);
+
   glNewList(glID[0], GL_COMPILE);
   glBegin(GL_TRIANGLE_STRIP);
@@ -103 +104 @@
   glVertex3f(0.0, .5, .5);
   glTexCoord2f(1, 0);
+  glVertex3f(0.0, -.5, .5);
+  glTexCoord2f(0, 1);
   glVertex3f(0.0, .5, -.5);
-  glTexCoord2f(0, 1);
-  glVertex3f(0.0, -.5, .5);
   glTexCoord2f(0, 0);
   glVertex3f(0.0, -.5, -.5);
@@ -229 +230 @@
 
   glMatrixMode(GL_MODELVIEW);
-  
+  //  glDisable(GL_LIGHTING);
+  material->select();
+  glPushAttrib(GL_ENABLE_BIT);
+  glDisable(GL_DEPTH_TEST);
+  glDisable(GL_CULL_FACE);
+  glDisable(GL_LIGHTING);  // will be set back when leaving 2D-mode
+  glEnable(GL_TEXTURE_2D);
+
+  /* This allows alpha blending of 2D textures with the scene */
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+
   Particle* drawPart = particles;
   if (likely(drawPart != NULL))
@@ -248 +261 @@
       glEnd();
     }
+  glPopAttrib();
+
 }