Changeset 7727 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

May 19, 2006, 2:25:15 PM (19 years ago)

Author:

bensch

Message:

trunk: some GL-properties for the Textures

Location:

trunk/src/lib/graphics/importer

Files:

• texture.cc (modified) (15 diffs)
• texture.h (modified) (1 diff)

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

@@ -30 +30 @@
 
 /**
- *  Constructor for a Texture
+ * @brief Constructor for a Texture
 */
 Texture::Texture(const std::string& imageName, GLenum target)
@@ -50 +50 @@
 
 /**
- *  Destructor of a Texture
-
-   Frees Data, and deletes the textures from GL
-*/
+ * @brief Destructor of a Texture
+ *
+ * Frees Data, and deletes the textures from GL
+ */
 Texture::~Texture()
 {
@@ -64 +64 @@
 
 /**
- *  loads an Image from a file to a Texture
+ * @brief loads an Image from a file to a Texture
  * @param imageName The image to load
 */
@@ -121 +121 @@
 
 /**
- * rebuilds the texture.
+ * @brief rebuilds the texture.
+ *
  * reloads the Texture from Memory to OpenGL.
  */
@@ -142 +143 @@
 
 /**
- * set the surface this Texture handles
+ * @brief set the surface this Texture handles
  * @param newSurface the new Surface to set as the image for this Texture.
  *
@@ -162 +163 @@
 
 /**
- * enables, disables textures
+ * @brief enables, disables textures
  * @param texturesEnabled true if the textures should be enabled
  */
@@ -175 +176 @@
 //////////////////////////////////////
 /**
- * converts surface to a new SDL_Surface, that is loadable by openGL
+ * @brief converts surface to a new SDL_Surface, that is loadable by openGL
  * @param surface the Surface to convert
  * @param hasAlpha if the newly created Surface has an alpha channel, true is returned otherwise false.
@@ -182 +183 @@
 SDL_Surface* Texture::prepareSurface(SDL_Surface* surface, bool& hasAlpha) const
 {
+  assert(surface != NULL);
   PRINTF(4)("Loading texture to OpenGL-Environment.\n");
 
@@ -190 +192 @@
 
   hasAlpha = false;
-  retSurface = SDL_CreateRGBSurface(SDL_SWSURFACE,
+  int pixelDepth = 24;
+
+  /* Save the alpha blending attributes */
+  saved_flags = surface->flags&(SDL_SRCALPHA | SDL_RLEACCELOK);
+  saved_alpha = surface->format->alpha;
+  if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA )
+  {
+    SDL_SetAlpha(surface, 0, 0);
+    hasAlpha = true;
+    pixelDepth = 32;
+  }
+
+  retSurface = SDL_CreateRGBSurface(SDL_HWSURFACE,
                                     surface->w, surface->h,
-                                    32,
+                                    pixelDepth,
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
                                     0x000000FF,
@@ -206 +220 @@
                                    );
   if ( retSurface == NULL )
-  {
     return NULL;
-  }
-
-  /* Save the alpha blending attributes */
-  saved_flags = surface->flags&(SDL_SRCALPHA|SDL_RLEACCELOK);
-  saved_alpha = surface->format->alpha;
-  if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA )
-  {
-    SDL_SetAlpha(surface, 0, 0);
-  }
 
   /* Copy the surface into the GL texture image */
@@ -237 +241 @@
 
 /**
- *  Loads a Texture to the openGL-environment.
+ * @brief Loads a Texture to the openGL-environment.
  * @param surface the Image to load to openGL
  * @returns The ID of the texture.
@@ -246 +250 @@
   //     glDeleteTextures(1, &this->texture);
   //   this->texture = 0;
+  assert(surface != NULL);
 
   int      errorCode = 0;           //!< the error code for the texture loading functions
@@ -252 +257 @@
   int      mipmapWidth = 0;         //!< the width of the mipmap
   int      mipmapHight = 0;         //!< the height of the mipmap
-
-
-  if (surface == NULL)
-    return 0;
+  GLenum   format = GL_RGB;
+  if (this->bAlpha)
+  {
+    format = GL_RGBA;
+    assert(surface->format->BitsPerPixel == 32);
+  }
+  else
+  {
+    assert(surface->format->BitsPerPixel == 24);
+  }
 
   /* Create an OpenGL texture for the image */
@@ -261 +272 @@
   glBindTexture(target, texture);
 
+//   glTexImage2D(target,  0,  format,
+//                surface->w,  surface->h,
+//                0, format,  GL_UNSIGNED_BYTE,
+//                surface->pixels);
+
   glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
   glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_REPEAT);
@@ -275 +291 @@
 
   /* build the Texture  OpenGL V >= 1.1 */
-  glTexImage2D(target,
-               0,
-               GL_RGBA,
-               surface->w,
-               surface->h,
-               0,
-               GL_RGBA,
-               GL_UNSIGNED_BYTE,
-               surface->pixels);
+
   //  printf("%s, w:%d h:%d, 0x%x\n", this->getName(), surface->w, surface->h, target);
 
   // build the MipMaps automaticaly
-  errorCode = gluBuild2DMipmaps(target,
-                                GL_RGBA,
-                                surface->w,
-                                surface->h,
-                                GL_RGBA,
-                                GL_UNSIGNED_BYTE,
+  errorCode = gluBuild2DMipmaps(target, format,
+                                surface->w,  surface->h,
+                                format,  GL_UNSIGNED_BYTE,
                                 surface->pixels
                                );

trunk/src/lib/graphics/importer/texture.h

@@ -43 +43 @@
 
     protected:
-
       bool setSurface(SDL_Surface* newSurface);
       bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; };
       bool setTexture(GLuint texture) { this->texture = texture; };
-
 
     private: