Changeset 3133 in orxonox.OLD

Timestamp:

Dec 8, 2004, 4:26:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: now PathTexture-stuff also works for the non-sdl-image-compiling

File:

• orxonox/branches/images/importer/material.cc (modified) (4 diffs)

orxonox/branches/images/importer/material.cc

@@ -15 +15 @@
    TGA-code: borrowed from nehe-Tutorials
 
-   ToDo: free SDL-surface when deleting Material.
+   ToDo: 
+   - free SDL-surface when deleting Material.
+   - delete imgNameWithPath after use creation.
 */
 
@@ -485 +487 @@
 bool Material::loadImage(char* imageName, GLuint* texture)
 {
-  char* imgNameWithPath= searchTextureInPaths(imageName);
+  char* imgNameWithPath = searchTextureInPaths(imageName);
   if (imgNameWithPath)
     {
@@ -510 +512 @@
   else
     {
-      if (verbose >=2)
-        printf ("Image not Found: %s\n", imageName);
-      return false;
-    }
-}
-#else
+      if (verbose >=1)
+        printf ("Image not Found: %s\n", imgNameWithPath);
+      return false;
+    }
+}
+
+
+#else /* HAVE_SDL_SDL_IMAGE_H */
 /**
    \brief Makes the Programm ready to Read-in a texture-File
@@ -523 +527 @@
 bool Material::loadImage(char* imageName, GLuint* texture)
 {
-  if (!strncmp(imageName+strlen(imageName)-4, ".bmp", 4))
-    {
-      if (verbose >=2)
-        printf ("Requested bmp-image. Trying to Import.\n");
-      return loadBMP(imageName, texture);
-    }
-
-  else if (!strncmp(imageName+strlen(imageName)-4, ".jpg", 4) || !strncmp(imageName+strlen(imageName)-5, ".jpg", 5))
-    {
-      if (verbose >=2)
-        printf ("Requested jpeg-image. Trying to Import\n");
-      return loadJPG(imageName, texture);
-    }
-  else if (!strncmp(imageName+strlen(imageName)-4, ".tga", 4))
-    {
-      if (verbose >=2)
-        printf ("Requested tga-image. Trying to Import\n");
-      return loadTGA(imageName, texture);
-    }
-  else if (!strncmp(imageName+strlen(imageName)-4, ".png", 4))
-    {
-      if (verbose >=2)
-        printf ("Requested png-image. Trying to Import\n");
-      return loadPNG(imageName, texture);
+  char* imgNameWithPath = searchTextureInPaths(imageName);
+  if (imgNameWithPath)
+    {
+      if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".bmp", 4))
+        {
+          if (verbose >=2)
+            printf ("Requested bmp-image. Trying to Import.\n");
+          return loadBMP(imgNameWithPath, texture);
+        }
+      
+      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".jpg", 4) || !strncmp(imgNameWithPath+strlen(imgNameWithPath)-5, ".jpg", 5))
+        {
+          if (verbose >=2)
+            printf ("Requested jpeg-image. Trying to Import\n");
+          return loadJPG(imgNameWithPath, texture);
+        }
+      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".tga", 4))
+        {
+          if (verbose >=2)
+            printf ("Requested tga-image. Trying to Import\n");
+          return loadTGA(imgNameWithPath, texture);
+        }
+      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".png", 4))
+        {
+          if (verbose >=2)
+            printf ("Requested png-image. Trying to Import\n");
+          return loadPNG(imgNameWithPath, texture);
+        }
+      else
+        {
+          if (verbose >=1)
+            printf ("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imgNameWithPath);
+          return false;
+        }
     }
   else
     {
       if (verbose >=1)
-        printf ("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imageName);
-      return false;
-    }
-
+        printf ("Image not Found: %s\n", imgNameWithPath);
+      return false;
+    }
 }