Changeset 6467 in orxonox.OLD for trunk/src/util

Timestamp:

Jan 11, 2006, 11:46:52 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Texture loading with GL_TEXTURE_* in ResourceManager and Material

Location:

trunk/src/util/loading

Files:

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

trunk/src/util/loading/resource_manager.cc

@@ -407 +407 @@
 #ifndef NO_TEXTURES
         case IMAGE:
+          if (param1 != NULL)
+            tmpResource->texTarget = *(GLenum*)param1;
+          else
+            tmpResource->texTarget = GL_TEXTURE_2D;
           if(isFile(fullName))
             {
@@ -422 +426 @@
                     {
                       PRINTF(4)("Image %s resides to %s\n", fileName, imgName);
-                      tmpResource->pointer = new Texture(imgName);
+                      tmpResource->pointer = new Texture(imgName, tmpResource->texTarget);
                       delete[] imgName;
                       break;
@@ -666 +670 @@
                   match = true;
 #endif /* NO_SHADERS */
+#ifndef NO_TEXTURES
+              case IMAGE:
+                if (!param1)
+                {
+                  if ((*resource)->texTarget == GL_TEXTURE_2D)
+                    match = true;
+                }
+                else if ((*resource)->texTarget ==  *(GLenum*)param1)
+                  match = true;
+#endif /* NO_TEXTURES */
             default:
               match = true;

trunk/src/util/loading/resource_manager.h

@@ -81 +81 @@
   unsigned int      ttfSize;           //!< the size of the ttf-font (TTF)
 #endif /* NO_TEXT */
+#ifndef NO_TEXTURES
+  GLenum            texTarget;
+#endif /* NO_TEXTURES */
 };