Changeset 6646 in orxonox.OLD for trunk

Timestamp:

Jan 21, 2006, 5:48:00 PM (19 years ago)

Author:

bensch

Message:

trunk: ResourceManeger names

Location:

trunk/src/util/loading

Files:

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

trunk/src/util/loading/resource_manager.cc

@@ -1008 +1008 @@
 const char* ResourceManager::ResourceTypeToChar(ResourceType type)
 {
-  switch (type)
-  {
+  return ResourceManager::resourceNames[type];
+}
+
+/**
+ * @brief converts a String into a ResourceType (good for loading)
+ * @param resourceType the name of the Type
+ * @returns the Number of the Type, or 0 (defautl) if not found.
+ */
+ResourceType ResourceManager::stringToResourceType(const char* resourceType)
+{
+  assert(resourceType != NULL);
+  for (unsigned int i = 0; i < RESOURCE_TYPE_SIZE; i++)
+    if (!strcmp(resourceType, ResourceManager::resourceNames[i]))
+      return (ResourceType)i;
+  return (ResourceType)0;
+}
+
+/**
+ * The Names of the ResourceTypes
+ */
+const char* ResourceManager::resourceNames[] =
+{
 #ifndef NO_MODEL
-  case OBJ:
-    return "ObjectModel";
-    break;
-  case PRIM:
-    return "PrimitiveModel";
-    break;
-  case MD2:
-    return "MD2-Data";
-    break;
+  "ObjectModel",
+  "PrimitiveModel",
+  "MD2-Data",
 #endif
 #ifndef NO_TEXTURES
-  case IMAGE:
-    return "ImageFile (Texture)";
-    break;
+  "Texture",
 #endif
 #ifndef NO_AUDIO
-  case WAV:
-    return "SoundFile";
-    break;
-  case OGG:
-    return "MusicFile";
-    break;
+  "Sound",
+  "Music",
 #endif
 #ifndef NO_TEXT
-  case TTF:
-    return "Font (TTF)";
-    break;
+  "Font",
 #endif
 #ifndef NO_SHADERS
-  case SHADER:
-    return "Shader";
-    break;
-#endif
-  default:
-    return "unknown Format";
-    break;
-  }
-}
+  "Shader",
+#endif
+};

trunk/src/util/loading/resource_manager.h

@@ -47 +47 @@
   SHADER,               //!< openGL-shader program
 #endif /* NO_SHADERS */
+  RESOURCE_TYPE_SIZE
 };
 
@@ -132 +133 @@
 
   static const char* ResourceTypeToChar(ResourceType type);
-
+  static ResourceType stringToResourceType(const char* resourceType);
 
  private:
@@ -146 +147 @@
 
   std::vector<Resource*>   resourceList;       //!< The List of Resources, that has already been loaded.
+
+  static const char*       resourceNames[RESOURCE_TYPE_SIZE];
 };