Changeset 5856 in orxonox.OLD for trunk

Timestamp:

Dec 1, 2005, 6:32:59 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: TextureToGL is now more modular

Location:

trunk/src/lib

Files:

• graphics/importer/texture.cc (modified) (6 diffs)
• graphics/importer/texture.h (modified) (1 diff)
• graphics/text_engine/font.cc (modified) (2 diffs)
• sound/sound_engine.cc (modified) (1 diff)

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

@@ -80 +80 @@
         {
           SDL_Surface* tmpSurf;
-          if (this->texture)
+          if (this->texture != 0 && glIsTexture(this->texture))
             glDeleteTextures(1, &this->texture);
           // load the new Image to memory
@@ -88 +88 @@
             PRINTF(4)("loading Image %s\n", imageName);
             if (this->prepareSurface(tmpSurf))
-              loadTexToGL();
+              this->texture = Texture::loadTexToGL(this->image);
+
             SDL_FreeSurface(tmpSurf);
             return true;
@@ -110 +111 @@
 bool Texture::rebuild()
 {
-  if (this->texture != 0)
+  if (this->texture != 0 && glIsTexture(this->texture))
     {
       glDeleteTextures(1,&this->texture);
@@ -119 +120 @@
     {
       PRINTF(3)("Reloading Texture of %s '%s'\n", this->getClassName(), this->getName());
-      this->loadTexToGL();
+      this->texture = loadTexToGL(this->image);
     }
 
@@ -199 +200 @@
  * @returns The ID of the texture.
  */
-GLuint Texture::loadTexToGL ()
-{
-  if (this->texture != 0 && glIsTexture(this->texture))
-    glDeleteTextures(1, &this->texture);
-  this->texture = 0;
-
-  if (this->image == NULL)
+GLuint Texture::loadTexToGL (const SDL_Surface* surface)
+{
+//   if (this->texture != 0 && glIsTexture(this->texture))
+//     glDeleteTextures(1, &this->texture);
+//   this->texture = 0;
+
+  GLuint texture;
+
+  if (surface == NULL)
     return 0;
 
   /* Create an OpenGL texture for the image */
-  glGenTextures(1, &this->texture);
-  glBindTexture(GL_TEXTURE_2D, this->texture);
+  glGenTextures(1, &texture);
+  glBindTexture(GL_TEXTURE_2D, texture);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -217 +220 @@
                0,
                GL_RGBA,
-               this->image->w, this->image->h,
+               surface->w, surface->h,
                0,
                GL_RGBA,
                GL_UNSIGNED_BYTE,
-               this->image->pixels);
+               surface->pixels);
   // build the MipMaps
   gluBuild2DMipmaps(GL_TEXTURE_2D,
                     GL_RGBA,
-                    this->image->w,
-                    this->image->h,
+                    surface->w,
+                    surface->h,
                     GL_RGBA,
                     GL_UNSIGNED_BYTE,
-                    this->image->pixels);
+                    surface->pixels);
   glBindTexture(GL_TEXTURE_2D, 0);
-  return this->texture;
-}
+  return texture;
+}

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

@@ -34 +34 @@
       inline bool hasAlpha() const {return bAlpha;}
 
+      static GLuint loadTexToGL (const SDL_Surface* surface);
+
+      const SDL_Surface* const getStoredImage() { return this->image; };
+
     protected:
       bool prepareSurface(SDL_Surface* input);
       bool setSurface(SDL_Surface* newSurface);
+      bool setTexture(GLuint texture) { this->texture = texture; };
 
-      GLuint loadTexToGL ();
 
     private:

trunk/src/lib/graphics/text_engine/font.cc

@@ -182 +182 @@
   }
   if (this->prepareSurface(surface))
-    this->loadTexToGL( );
+  {
+    this->setTexture(Texture::loadTexToGL(this->getStoredImage()));
+  }
 
   // initializing the Glyphs.
@@ -491 +493 @@
 
   if (this->setSurface(tmpSurf))
-    loadTexToGL();
+    (this->setTexture(Texture::loadTexToGL(tmpSurf)));
 }
 

trunk/src/lib/sound/sound_engine.cc

@@ -281 +281 @@
 
   // INITIALIZING THE DEVICE:
-  ALchar deviceName[] =
+  ALubyte deviceName[] =
 #ifdef __WIN32__
       "native";