Changeset 5324 in orxonox.OLD for trunk/src

Timestamp:

Oct 8, 2005, 6:52:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better algorithm for loading the Shader through the ResourceManager
if a fragment-Shader was supplied, but the file did not exist, the Shader gets rejected

Location:

trunk/src

Files:

• story_entities/campaign.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (1 diff)

trunk/src/story_entities/campaign.cc

@@ -240 +240 @@
 void Campaign::nextLevel()
 {
-  printf("Campaign:nextLevel()\n");
+  PRINTF(4)("Campaign:nextLevel()\n");
   this->currentEntity->stop();
 }

trunk/src/util/resource_manager.cc

@@ -387 +387 @@
             if(ResourceManager::isFile(fullName))
             {
-              char* secFullName = NULL;
               if (param1 != NULL)
               {
-                secFullName = ResourceManager::getFullName((const char*)param1);
-                printf("%s\n", secFullName);
+                char* secFullName = ResourceManager::getFullName((const char*)param1);
                 if (ResourceManager::isFile(secFullName))
                 {
-                  printf("ok:: %s\n", secFullName);
                   tmpResource->secFileName = new char[strlen((const char*)param1)+1];
                   strcpy(tmpResource->secFileName, (const char*) param1);
+                  tmpResource->pointer = new Shader(fullName, secFullName);
                 }
-                else
-                {
-                  delete[] secFullName;
-                  secFullName = NULL;
-                  tmpResource->secFileName = NULL;
-                }
+                delete secFullName;
               }
               else
+              {
                 tmpResource->secFileName = NULL;
-              printf("%s::%s\n", fullName, secFullName);
-              tmpResource->pointer = new Shader(fullName, secFullName);
-              if (secFullName != NULL)
-                delete[] secFullName;
+                tmpResource->pointer = new Shader(fullName, NULL);
+              }
             }
             break;