Changeset 5754 in orxonox.OLD

Timestamp:

Nov 24, 2005, 11:53:58 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Texture even better

Location:

trunk/src/lib

Files:

• graphics/importer/texture.cc (modified) (5 diffs)
• util/executor/executor_specials.h (modified) (1 diff)

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

@@ -38 +38 @@
   this->texture = 0;
   this->image = NULL;
+
   if (imageName != NULL)
     this->loadImage(imageName);
@@ -64 +65 @@
   if (GraphicsEngine::texturesEnabled)
     {
+      if (this->image != NULL)
+        {
+          SDL_FreeSurface(this->image);
+          this->image = NULL;
+        }
+      if (this->texture != 0)
+        {
+          glDeleteTextures(1, &this->texture);
+          this->texture = 0;
+        }
       if (imageName != NULL)
         {
@@ -73 +84 @@
           if(tmpSurf != NULL)
           {
-            PRINTF(3)("loading Image %s\n", imageName);
+            PRINTF(4)("loading Image %s\n", imageName);
             this->image = this->prepareSurface(tmpSurf);
             this->texture = loadTexToGL(this->image);
@@ -88 +99 @@
       else
         {
+          PRINTF(2)("Image-Name not specified\n");
           return false;
         }
     }
-    return false;
-}
-
+  return false;
+}
+
+bool Texture::reload()
+{
+  if (this->texture != 0)
+    {
+      glDeleteTextures(1,&this->texture);
+      this->texture = 0;
+    }
+
+  if (this->image != NULL)
+    this->texture = this->loadTexToGL(this->image);
+  
+}
+
+/**
+ * converts surface to a new SDL_Surface, that is loadable by openGL
+ * @param surface the Surface to convert
+ * @returns a !!new!! Surface, that is loadable by openGL.
+ */
 SDL_Surface* Texture::prepareSurface(SDL_Surface* surface)
 {
@@ -118 +148 @@
 #endif
                                );
-  if ( image == NULL ) {
-    return 0;
-  }
+  if ( image == NULL )
+    return NULL;
   
   /* Save the alpha blending attributes */

trunk/src/lib/util/executor/executor_specials.h

@@ -9 +9 @@
 #include "executor.h"
 
+#include "compiler.h"
 #include "tinyxml.h"
 // FORWARD DECLARATION