Changeset 3087 in orxonox.OLD for orxonox

Timestamp:

Dec 4, 2004, 7:02:56 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/images: check for different File-types

Location:

orxonox/branches/images/importer

Files:

• material.cc (modified) (3 diffs)
• material.h (modified) (1 diff)

orxonox/branches/images/importer/material.cc

@@ -157 +157 @@
 void Material::setName (char* mtlName)
 {
-  //  if (verbose >= 3)
+  if (verbose >= 3)
     printf("setting Material Name to %s.\n", mtlName);
   name = new char [strlen(mtlName)];
@@ -320 +320 @@
 
   //  diffuseTextureSet = loadBMP(dMap, &diffuseTexture);
-  diffuseTextureSet = loadJPG(dMap, &diffuseTexture);
+  diffuseTextureSet = loadImage(dMap, &diffuseTexture);
 
 }
@@ -350 +350 @@
 void Material::setBump(char* bump)
 {
+
+}
+
+/**
+   \brief Makes the Programm ready to Read-in a texture-File
+   1. Checks what type of Image should be imported
+   2. ToDO: Checks where to find the Image
+*/
+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 (verbose >=1)
+        printf ("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imageName);
+      return false;
+    }
 
 }

orxonox/branches/images/importer/material.h

@@ -85 +85 @@
 
   // TEXTURING
+  bool loadImage(char* imageName, GLuint* texture);
+
   bool loadBMP (char* bmpName, GLuint* texture);
+
   bool loadJPG (char* jpgName, GLuint* texture);
   void decodeJPG(jpeg_decompress_struct* cinfo, tImageJPG *pImageData);