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

Timestamp:

Oct 8, 2005, 5:27:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shaders can now be loaded via the ResourceManager

Location:

trunk/src/util

Files:

• resource_manager.cc (modified) (10 diffs)
• resource_manager.h (modified) (2 diffs)

trunk/src/util/resource_manager.cc

@@ -36 +36 @@
 #include "ogg_player.h"
 #endif /* NO_AUDIO */
+#ifndef NO_SHADERS
+#include "shader.h"
+#endif /* NO_SHADERS */
 
 #include "list.h"
@@ -190 +193 @@
 #ifndef NO_MODEL
 #define __IF_OK
-  if (!strncmp(fileName+(strlen(fileName)-4), ".obj", 4))
+  if (!strncasecmp(fileName+(strlen(fileName)-4), ".obj", 4))
     tmpType = OBJ;
   else if (!strncmp(fileName+(strlen(fileName)-4), ".md2", 4))
     tmpType = MD2;
-  else if (!strcmp(fileName, "cube") ||
-           !strcmp(fileName, "sphere") ||
-           !strcmp(fileName, "plane") ||
-           !strcmp(fileName, "cylinder") ||
-           !strcmp(fileName, "cone"))
+  else if (!strcasecmp(fileName, "cube") ||
+           !strcasecmp(fileName, "sphere") ||
+           !strcasecmp(fileName, "plane") ||
+           !strcasecmp(fileName, "cylinder") ||
+           !strcasecmp(fileName, "cone"))
     tmpType = PRIM;
 #endif /* NO_MODEL */
@@ -206 +209 @@
 #endif
 #define __IF_OK
-  if (!strncmp(fileName+(strlen(fileName)-4), ".wav", 4))
+  if (!strncasecmp(fileName+(strlen(fileName)-4), ".wav", 4))
     tmpType = WAV;
-  else if (!strncmp(fileName+(strlen(fileName)-4), ".mp3", 4))
+  else if (!strncasecmp(fileName+(strlen(fileName)-4), ".mp3", 4))
     tmpType = MP3;
-  else if (!strncmp(fileName+(strlen(fileName)-4), ".ogg", 4))
+  else if (!strncasecmp(fileName+(strlen(fileName)-4), ".ogg", 4))
     tmpType = OGG;
 #endif /* NO_AUDIO */
@@ -218 +221 @@
 #endif
 #define __IF_OK
- if (!strncmp(fileName+(strlen(fileName)-4), ".ttf", 4))
+ if (!strncasecmp(fileName+(strlen(fileName)-4), ".ttf", 4))
     tmpType = TTF;
 #endif /* NO_TEXT */
+#ifndef NO_SHADERS
+#ifdef __IF_OK
+  else
+#endif
+#define __IF_OK
+ if (!strncasecmp(fileName+(strlen(fileName)-5), ".vert", 5))
+    tmpType = SHADER;
+#endif /* NO_SHADERS */
 #ifndef NO_TEXTURES
 #ifdef __IF_OK
@@ -308 +319 @@
               if (param1 != NULL)
                 {
-                  tmpResource->skinFileName = new char[strlen((const char*)param1)+1];
-                  strcpy(tmpResource->skinFileName, (const char*) param1);
+                  tmpResource->secFileName = new char[strlen((const char*)param1)+1];
+                  strcpy(tmpResource->secFileName, (const char*) param1);
                 }
               else
-                tmpResource->skinFileName = NULL;
-              tmpResource->pointer = new MD2Data(fullName, tmpResource->skinFileName);
+                tmpResource->secFileName = NULL;
+              tmpResource->pointer = new MD2Data(fullName, tmpResource->secFileName);
             }
               break;
@@ -372 +383 @@
           break;
 #endif /* NO_TEXTURES */
+#ifndef NO_SHADERS
+          case SHADER:
+            if(ResourceManager::isFile(fullName))
+            {
+              char* secFullName = NULL;
+              if (param1 != NULL)
+              {
+                secFullName = ResourceManager::getFullName((const char*)param1);
+                printf("%s\n", secFullName);
+                if (ResourceManager::isFile(secFullName))
+                {
+                  printf("ok:: %s\n", secFullName);
+                  tmpResource->secFileName = new char[strlen((const char*)param1)+1];
+                  strcpy(tmpResource->secFileName, (const char*) param1);
+                }
+                else
+                {
+                  delete[] secFullName;
+                  secFullName = NULL;
+                  tmpResource->secFileName = NULL;
+                }
+              }
+              else
+                tmpResource->secFileName = NULL;
+              printf("%s::%s\n", fullName, secFullName);
+              tmpResource->pointer = new Shader(fullName, secFullName);
+              if (secFullName != NULL)
+                delete[] secFullName;
+            }
+            break;
+#endif /* NO_SHADERS */
         default:
           tmpResource->pointer = NULL;
@@ -458 +500 @@
               break;
 #endif /* NO_TEXTURES */
+#ifndef NO_SHADERS
+            case SHADER:
+              delete (Shader*)resource->pointer;
+              break;
+#endif /* NO_SHADERS */
             default:
               PRINTF(2)("NOT YET IMPLEMENTED !!FIX FIX!!\n");
@@ -537 +584 @@
               if (!param1)
                 {
-                  if (enumRes->skinFileName == NULL)
+                  if (enumRes->secFileName == NULL)
                     match = true;
                 }
-              else if (!strcmp(enumRes->skinFileName, (const char*)param1))
+              else if (!strcmp(enumRes->secFileName, (const char*)param1))
                 match = true;
               break;
@@ -555 +602 @@
               break;
 #endif /* NO_TEXT */
+#ifndef NO_SHADERS
+              case SHADER:
+                if (!param1)
+                {
+                  if (enumRes->secFileName == NULL)
+                    match = true;
+                }
+                else if (!strcmp(enumRes->secFileName, (const char*)param1))
+                  match = true;
+#endif /* NO_SHADERS */
             default:
               match = true;
@@ -862 +919 @@
       break;
 #endif
+#ifndef NO_SHADERS
+    case SHADER:
+      return "Shader";
+      break;
+#endif
     default:
       return "unknown Format";

trunk/src/util/resource_manager.h

@@ -43 +43 @@
 #endif /* NO_AUDIO */
 #ifndef NO_TEXTURES
-  IMAGE                 //!< loading an image
+  IMAGE,                //!< loading an image
 #endif /* NO_TEXTURES */
+#ifndef NO_SHADERS
+  SHADER,               //!< openGL-shader program
+#endif /* NO_SHADERS */
 };
 
@@ -75 +78 @@
   float             modelSize;         //!< the size of the model (OBJ/PRIM)
 #ifndef NO_MODEL
-  char*             skinFileName;      //!< skinFileName (MD2)
+  char*             secFileName;       //!< a seconf fileName
 #endif /* NO_MODEL */
 #ifndef NO_TEXT