Changeset 6812 in orxonox.OLD for trunk/src/lib/graphics/importer/material.cc

Timestamp:

Jan 28, 2006, 4:43:57 PM (18 years ago)

Author:

bensch

Message:

trunk: Particles should work again

File:

• trunk/src/lib/graphics/importer/material.cc (modified) (2 diffs)

trunk/src/lib/graphics/importer/material.cc

@@ -108 +108 @@
 
   // setting the transparency
-  if (this->transparency < 1.0)
-    {
-      glEnable(GL_BLEND);
-      glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-      //glColor4f(*(this->diffuse), *(this->diffuse+1), *(this->diffuse+2), this->transparency);
-    }
+  if (this->transparency < 1.0 ||       /* This allows alpha blending of 2D textures with the scene */
+      (this->diffuseTexture && this->diffuseTexture->hasAlpha()))
+  {
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE/*_MINUS_SRC_ALPHA*/);
+  }
   else
     {
@@ -131 +131 @@
       glEnable(GL_TEXTURE_2D);
       glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
-
-      /* This allows alpha blending of 2D textures with the scene */
-      if (this->diffuseTexture->hasAlpha())
-        {
-          glEnable(GL_BLEND);
-          glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        }
     }
   else