Changeset 3966 in orxonox.OLD for orxonox/trunk/src/lib/graphics

Timestamp:

Apr 26, 2005, 12:23:38 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/particleEngine into the trunk, because of the new vector class
merged with command:
svn merge -r 3922:HEAD particleEngine/ ../trunk/

not merged src/story_entities/world.cc. will do this at a later time (do not forget)

Location:

orxonox/trunk/src/lib/graphics

Files:

• importer/material.cc (modified) (3 diffs)
• importer/texture.cc (modified) (5 diffs)
• importer/texture.h (modified) (2 diffs)
• particles (copied) (copied from orxonox/branches/particleEngine/src/lib/graphics/particles)
• particles/particle_emitter.cc (copied) (copied from orxonox/branches/particleEngine/src/lib/graphics/particles/particle_emitter.cc)
• particles/particle_emitter.h (copied) (copied from orxonox/branches/particleEngine/src/lib/graphics/particles/particle_emitter.h)
• particles/particle_engine.cc (copied) (copied from orxonox/branches/particleEngine/src/lib/graphics/particles/particle_engine.cc)
• particles/particle_engine.h (copied) (copied from orxonox/branches/particleEngine/src/lib/graphics/particles/particle_engine.h)
• particles/particle_system.cc (copied) (copied from orxonox/branches/particleEngine/src/lib/graphics/particles/particle_system.cc)
• particles/particle_system.h (copied) (copied from orxonox/branches/particleEngine/src/lib/graphics/particles/particle_system.h)

orxonox/trunk/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);
@@ -98 +94 @@
       glBlendFunc(GL_SRC_ALPHA, GL_ONE);
     }
+  else
+    {
+      glDisable(GL_BLEND);
+      glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+    }
+
 
   // setting illumination Model 
@@ -109 +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/trunk/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;
       }
       
@@ -119 +121 @@
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-      /*      glTexImage2D(GL_TEXTURE_2D,
+      // build the Texture
+      glTexImage2D(GL_TEXTURE_2D,
                    0,
                    GL_RGBA,
@@ -127 +130 @@
                    GL_UNSIGNED_BYTE,
                    image->pixels);
-      */
+      // build the MipMaps
       gluBuild2DMipmaps(GL_TEXTURE_2D,
-                        3,
+                        GL_RGBA,
                         w,
                         h,
@@ -135 +138 @@
                         GL_UNSIGNED_BYTE,
                         image->pixels);
-
+      
       SDL_FreeSurface(image); /* No longer needed */
       

orxonox/trunk/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);