Changeset 5863 in orxonox.OLD for trunk/src/lib/graphics/importer/texture.cc

Timestamp:

Dec 1, 2005, 9:14:30 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: TextureSequence finished for testing

File:

• trunk/src/lib/graphics/importer/texture.cc (modified) (7 diffs)

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

@@ -45 +45 @@
 }
 
+
 /**
  *  Destructor of a Texture
@@ -57 +58 @@
     SDL_FreeSurface(this->image);
 }
+
 
 /**
@@ -114 +116 @@
 }
 
+
+/**
+ * rebuilds the texture.
+ * reloads the Texture from Memory to OpenGL.
+ */
 bool Texture::rebuild()
 {
@@ -128 +135 @@
       this->setTexture(loadTexToGL(this->image));
     }
-
-}
-
+}
+
+
+/**
+ * set the surface this Texture handles
+ * @param newSurface the new Surface to set as the image for this Texture.
+ *
+ * This deletes the old version of the stored Texture,
+ * and sets the newly given Surface as current.
+ */
+bool Texture::setSurface(SDL_Surface* newSurface)
+{
+  if (this->image != NULL)
+    SDL_FreeSurface(this->image);
+
+  this->image = newSurface;
+
+  return (this->image != NULL);
+}
+
+
+bool Texture::texturesEnabled = true;
+
+/**
+ * enables, disables textures
+ * @param texturesEnabled true if the textures should be enabled
+ */
+void Texture::setTextureEnableState(bool texturesEnabled)
+{
+  Texture::texturesEnabled = texturesEnabled;
+}
+
+
+//////////////////////////////////////
+// UTILITY FUNCTIONALITY OF TEXTURE //
+//////////////////////////////////////
 /**
  * converts surface to a new SDL_Surface, that is loadable by openGL
@@ -148 +188 @@
   hasAlpha = false;
   retSurface = SDL_CreateRGBSurface(SDL_SWSURFACE,
-                               surface->w, surface->h,
-                               32,
+                                    surface->w, surface->h,
+                                    32,
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
                                0x000000FF,
@@ -156 +196 @@
                                0xFF000000
 #else
-                               0xFF000000,
+                                   0xFF000000,
                                0x00FF0000,
                                0x0000FF00,
                                0x000000FF
 #endif
-                               );
+                                   );
   if ( retSurface == NULL )
   {
@@ -191 +231 @@
 }
 
-/**
- * set the surface this Texture handles
- * @param newSurface the new Surface to set as the image for this Texture.
- *
- * This deletes the old version of the stored Texture,
- * and sets the newly given Surface as current.
- */
-bool Texture::setSurface(SDL_Surface* newSurface)
-{
-  if (this->image != NULL)
-    SDL_FreeSurface(this->image);
-
-  this->image = newSurface;
-
-  return (this->image != NULL);
-}
-
-
-bool Texture::texturesEnabled = true;
-
-/**
- * enables, disables textures
- * @param texturesEnabled true if the textures should be enabled
- */
-void Texture::setTextureEnableState(bool texturesEnabled)
-{
-  Texture::texturesEnabled = texturesEnabled;
-}
-
-
-//////////////////////////////////////
-// UTILITY FUNCTIONALITY OF TEXTURE //
-//////////////////////////////////////
+
 /**
  *  Loads a Texture to the openGL-environment.