Changeset 6799 in orxonox.OLD for trunk/src/lib

Timestamp:

Jan 27, 2006, 4:16:02 PM (19 years ago)

Author:

bensch

Message:

trunk: new Hover

Location:

trunk/src/lib

Files:

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

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

@@ -112 +112 @@
       glEnable(GL_BLEND);
       glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-      glColor4f(*(this->diffuse), *(this->diffuse+1), *(this->diffuse+2), this->transparency);
+      //glColor4f(*(this->diffuse), *(this->diffuse+1), *(this->diffuse+2), this->transparency);
     }
   else
     {
       glDisable(GL_BLEND);
-      glColor4f(*(this->diffuse), *(this->diffuse+1), *(this->diffuse+2), 1);
+      //glColor4f(*(this->diffuse), *(this->diffuse+1), *(this->diffuse+2), 1);
     }
 

trunk/src/lib/particles/sprite_particles.cc

@@ -106 +106 @@
 
   Particle* drawPart = particles;
+  this->material.select();
 
   GLboolean checkLight = false;
@@ -111 +112 @@
   if (checkLight == GL_TRUE)
     glDisable(GL_LIGHTING);
+  glEnable(GL_ALPHA_TEST);
+  glEnable(GL_DEPTH_TEST);
+  glClearDepth(1.0);
+  glDepthFunc(GL_LEQUAL);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  glEnable(GL_BLEND);
+  glAlphaFunc(GL_GREATER,0.1);
+  glEnable(GL_ALPHA_TEST);
+  glEnable(GL_TEXTURE_2D);
+  glEnable(GL_CULL_FACE);
+
   glMatrixMode(GL_MODELVIEW);
-  glDepthMask(GL_FALSE);
-
-  material.select();
-  glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
+  //glDepthMask(GL_FALSE);
+//glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
 
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@@ -160 +170 @@
     drawPart = drawPart->next;
   }
-  glDepthMask(GL_TRUE);
+  //glDepthMask(GL_TRUE);
   glPopAttrib();
 }