Changeset 3952 in orxonox.OLD

Timestamp:

Apr 25, 2005, 1:10:24 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: blending now an option of material

Location:

orxonox/branches/particleEngine/src/lib/graphics

Files:

• importer/material.cc (modified) (2 diffs)
• importer/texture.cc (modified) (2 diffs)
• importer/texture.h (modified) (2 diffs)
• particles/particle_system.cc (modified) (2 diffs)

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

@@ -100 +100 @@
     }
 
+
   // setting illumination Model 
   if (this->illumModel == 1) //! \todo make this work, if no vertex-normals are read.
@@ -110 +111 @@
       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

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

@@ -25 +25 @@
 Texture::Texture(const char* imageName)
 {
+  bAlpha = false;
   this->texture = 0;
   if (imageName)
@@ -112 +113 @@
       if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA ) {
         SDL_SetAlpha(surface, saved_flags | SDL_OPENGL, saved_alpha);
+        this->bAlpha = true;
       }
       

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

@@ -23 +23 @@
   char* searchTextureInPaths(const char* texName) const;
   void swap(unsigned char &a, unsigned char &b);
+
+  bool bAlpha;           //!< if the texture has an alpha channel.
  public:
   Texture(const char* imageName = NULL);
@@ -30 +32 @@
   inline GLuint getTexture(void) {return this->texture;} 
   GLuint loadTexToGL (SDL_Surface* surface);
+  inline bool hasAlpha(void) {return bAlpha;}
 
   bool loadImage(const char* imageName);

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

@@ -230 +230 @@
   //  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;
@@ -259 +249 @@
       glEnd();
     }
-  glPopAttrib();
-
 }