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

Timestamp:

Oct 7, 2005, 6:17:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ResourceManage-fixes

Location:

trunk/src/util

Files:

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

trunk/src/util/resource_manager.cc

@@ -236 +236 @@
  * loads resources
  * @param fileName: The fileName of the resource to load
- * @param type: The Type of Resource to load (\see ResourceType)
+ * @param type: The Type of Resource to load.
  * @param prio: The ResourcePriority of this resource (will only be increased)
  * @param param1: an additional option to parse (see the constuctors for more help)
@@ -247 +247 @@
 {
   // searching if the resource was loaded before.
-  Resource* tmpResource = this->locateResourceByInfo(fileName, type, param1, param2,param3);
-  if (tmpResource) // if the resource was loaded before.
+  Resource* tmpResource = this->locateResourceByInfo(fileName, type, param1, param2, param3);
+  if (tmpResource != NULL) // if the resource was loaded before.
     {
       PRINTF(4)("not loading cached resource %s\n", tmpResource->name);
+      printf("adding %s count: %d\n", tmpResource->pointer->getName(),  tmpResource->count);
       tmpResource->count++;
       if(tmpResource->prio < prio)
@@ -307 +308 @@
           if(ResourceManager::isFile(fullName))
             {
-              if (param1)
+              if (param1 != NULL)
                 {
                   tmpResource->skinFileName = new char[strlen((const char*)param1)+1];
@@ -321 +322 @@
         case TTF:
             if (param1)
-              tmpResource->ttfSize = *(int*)param1;
+              tmpResource->ttfSize = *(unsigned int*)param1;
             else
               tmpResource->ttfSize = FONT_DEFAULT_SIZE;
 
           if(isFile(fullName))
-            tmpResource->pointer = new Font(fullName,
-                                            tmpResource->ttfSize);
+            tmpResource->pointer = new Font(fullName, tmpResource->ttfSize);
           else
             PRINTF(2)("Sorry, %s does not exist. Not loading Font\n", fullName);
@@ -375 +375 @@
         default:
           tmpResource->pointer = NULL;
-          PRINTF(1)("No type found for %s.\n   !!This should not happen unless the Type is not supported yet.!!\n", tmpResource->name);
+          PRINTF(1)("No type found for %s.\n   !!This should not happen unless the Type is not supported yet. JUST DO IT!!\n", tmpResource->name);
           break;
         }
@@ -419 +419 @@
 bool ResourceManager::unload(Resource* resource, ResourcePriority prio)
 {
+  if (resource == NULL)
+    return false;
+  printf("removing %s count: %d\n", resource->pointer->getName(),  resource->count);
   if (resource->count > 0)
     resource->count--;
+
   if (resource->prio <= prio)
     {
@@ -538 +542 @@
                     match = true;
                 }
-              else if (!strcmp(enumRes->skinFileName, (const char*) param1))
+              else if (enumRes->skinFileName!= NULL && !strcmp(enumRes->skinFileName, (const char*) param1))
                 match = true;
               break;
@@ -549 +553 @@
                     subMatch = true;
                 }
-              else if (enumRes->ttfSize == *(int*)param1)
+              else if (enumRes->ttfSize == *(unsigned int*)param1)
                 subMatch = true;
               break;
@@ -793 +797 @@
     {
       PRINT(0)("-----------------------------------------\n");
-      PRINT(0)("Name: %s; References: %d; Type:", enumRes->name, enumRes->count);
-      switch (enumRes->type)
-        {
-#ifndef NO_MODEL
-          case OBJ:
-          PRINT(0)("ObjectModel\n");
-          break;
-        case PRIM:
-          PRINT(0)("PrimitiveModel\n");
-          break;
-#endif
-#ifndef NO_TEXTURES
-        case IMAGE:
-          PRINT(0)("ImageFile (Texture)\n");
-          break;
-#endif
-#ifndef NO_AUDIO
-        case WAV:
-          PRINT(0)("SoundFile\n");
-          break;
-        case OGG:
-          PRINT(0)("MusicFile\n");
-          break;
-#endif
-        default:
-          PRINT(0)("Do not know this format\n");
-          break;
-        }
+      PRINT(0)("Name: %s; References: %d; Type: %s ", enumRes->name, enumRes->count, ResourceManager::ResourceTypeToChar(enumRes->type));
+
       PRINT(0)("gets deleted at ");
       switch(enumRes->prio)
@@ -846 +824 @@
   PRINT(0)("==================================RM==\n");
 }
+
+
+/**
+ * converts a ResourceType into the corresponding String
+ * @param type the ResourceType to translate
+ * @returns the converted String.
+ */
+const char* ResourceManager::ResourceTypeToChar(ResourceType type)
+{
+  switch (type)
+  {
+#ifndef NO_MODEL
+    case OBJ:
+      return "ObjectModel";
+      break;
+    case PRIM:
+      return "PrimitiveModel";
+      break;
+    case MD2:
+      return "MD2-Data";
+      break;
+#endif
+#ifndef NO_TEXTURES
+    case IMAGE:
+      return "ImageFile (Texture)";
+      break;
+#endif
+#ifndef NO_AUDIO
+    case WAV:
+      return "SoundFile";
+      break;
+    case OGG:
+      return "MusicFile";
+      break;
+#endif
+#ifndef NO_TEXT
+    case TTF:
+      return "Font (TTF)";
+      break;
+#endif
+    default:
+      return "unknown Format";
+      break;
+  }
+}

trunk/src/util/resource_manager.h

@@ -106 +106 @@
   bool addImageDir(const char* imageDir);
   BaseObject* load(const char* fileName, ResourcePriority prio = RP_NO,
-             void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
+               void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
   BaseObject* load(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
-             void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
+               void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
   bool unload(void* pointer, ResourcePriority prio = RP_NO);
   bool unload(Resource* resource, ResourcePriority = RP_NO);
@@ -123 +123 @@
   static char* homeDirCheck(const char* fileName);
   static char* getFullName(const char* fileName);
+
+  static const char* ResourceTypeToChar(ResourceType type);
 
  private: