Changeset 3946 in orxonox.OLD for orxonox/branches/particleEngine/src/lib/graphics/importer

Timestamp:

Apr 24, 2005, 7:22:17 PM (20 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/importer

Files:

• material.cc (modified) (1 diff)
• texture.cc (modified) (3 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 */