Changeset 6812 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

trunk: Particles should work again

Location:

trunk/src/lib

Files:

• event/event_handler.cc (modified) (1 diff)
• graphics/importer/material.cc (modified) (2 diffs)
• particles/sprite_particles.cc (modified) (3 diffs)

trunk/src/lib/event/event_handler.cc

@@ -262 +262 @@
     SDL_WM_GrabInput(SDL_GRAB_OFF);
   else
-    SDL_WM_GrabInput(SDL_GRAB_ON);
+    ;//SDL_WM_GrabInput(SDL_GRAB_ON);
 }
 

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

trunk/src/lib/particles/sprite_particles.cc

@@ -112 +112 @@
   if (checkLight == GL_TRUE)
     glDisable(GL_LIGHTING);
+
   glEnable(GL_ALPHA_TEST);
-  glEnable(GL_DEPTH_TEST);
+  glDepthMask(GL_FALSE);
+  /*
   glClearDepth(1.0);
   glDepthFunc(GL_LEQUAL);
@@ -122 +124 @@
   glEnable(GL_TEXTURE_2D);
   glEnable(GL_CULL_FACE);
-
-  glMatrixMode(GL_MODELVIEW);
+  */
   //glDepthMask(GL_FALSE);
 //glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
@@ -170 +171 @@
     drawPart = drawPart->next;
   }
-  //glDepthMask(GL_TRUE);
+  glDepthMask(GL_TRUE);
   glPopAttrib();
 }