Changeset 6645 in orxonox.OLD for trunk/src

Timestamp:

Jan 21, 2006, 4:56:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: totally remastered the ResourceManager.
Now it takes MultiTypes instead of (void*) as parameters

1. This is TypeSafe
2. This is easier to use
3. This makes much more sense, and is objectOriented

also made some minor adjustments to the MultiType, some comparisons

also fixed the loading in all the Other classes like material md2 and so on

Location:

trunk/src

Files:

• lib/graphics/importer/material.cc (modified) (1 diff)
• lib/graphics/importer/md2Model.cc (modified) (1 diff)
• lib/graphics/shader.cc (modified) (1 diff)
• lib/graphics/text_engine/text.cc (modified) (1 diff)
• lib/util/executor/executor.cc (modified) (1 diff)
• lib/util/multi_type.cc (modified) (1 diff)
• lib/util/multi_type.h (modified) (2 diffs)
• util/loading/resource_manager.cc (modified) (17 diffs)
• util/loading/resource_manager.h (modified) (4 diffs)
• world_entities/environments/water.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/material.cc

@@ -303 +303 @@
   //! @todo Textures from .mtl-file need special care.
   if (dMap != NULL)
-    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (void*)&target);
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target);
   else
     this->diffuseTexture = NULL;

trunk/src/lib/graphics/importer/md2Model.cc

@@ -78 +78 @@
 {
   /* this creates the data container via ressource manager */
-  this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, (void*)skinFileName);
+  this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, skinFileName);
   if( unlikely(this->data == NULL))
     PRINTF(0)("The model was not found, MD2Model Loader finished abnormaly. Update the data-repos\n");

trunk/src/lib/graphics/shader.cc

@@ -106 +106 @@
 Shader* Shader::getShader(const char* vertexShaderFile, const char* fragmentShaderFile)
 {
-  return (Shader*)ResourceManager::getInstance()->load(vertexShaderFile, SHADER,  RP_LEVEL, (void*)fragmentShaderFile);
+  return (Shader*)ResourceManager::getInstance()->load(vertexShaderFile, SHADER,  RP_LEVEL, fragmentShaderFile);
 }
 

trunk/src/lib/graphics/text_engine/text.cc

@@ -92 +92 @@
   if (fontFile != NULL)
   {
-    tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
+    tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, (int)fontSize);
     if (tmpFont != NULL)
       this->font = tmpFont;

trunk/src/lib/util/executor/executor.cc

@@ -60 +60 @@
   {
     int type = va_arg(parameterList, int);
-    this->defaultValue[i].setType(type);
+    this->defaultValue[i].setType((MT_Type)type);
   }
 }

trunk/src/lib/util/multi_type.cc

@@ -187 +187 @@
  * @param type the new Type
  */
-void MultiType::setType(int type)
+void MultiType::setType(MT_Type type)
 {
   if (this->type != type)
-    this->type = (MT_Type)type;
+    this->type = type;
 }
 

trunk/src/lib/util/multi_type.h

@@ -31 +31 @@
  */
 class MultiType {
-
   public:
     MultiType();
@@ -55 +54 @@
     bool operator==(char value) const { return (this->getChar() == value); };
     bool operator==(const char* value) const;
+    bool operator==(MT_Type type) const { return (this->type == type); }
+    bool operator!=(MT_Type type) const { return (this->type != type); }
 
-    void setType(int type);
+    void setType(MT_Type type);
 
     void setBool(bool value);

trunk/src/util/loading/resource_manager.cc

@@ -230 +230 @@
  * @param fileName: The fileName of the resource to load
  * @param prio: The ResourcePriority of this resource (will only be increased)
+ * @param param0: an additional option to parse (see the constuctors for more help)
  * @param param1: an additional option to parse (see the constuctors for more help)
  * @param param2: an additional option to parse (see the constuctors for more help)
- * @param param3: an additional option to parse (see the constuctors for more help)
  * @returns a pointer to a desired Resource.
 */
-BaseObject* ResourceManager::load(const char* fileName, ResourcePriority prio, void* param1, void* param2, void* param3)
+BaseObject* ResourceManager::load(const char* fileName, ResourcePriority prio,
+                                   const MultiType& param0, const MultiType& param1, const MultiType& param2)
 {
   if (fileName == NULL)
@@ -290 +291 @@
 #endif /* NO_TEXTURES */
 #undef __IF_OK
-  return this->load(fileName, tmpType, prio, param1, param2, param3);
+  return this->load(fileName, tmpType, prio, param0, param1, param2);
 }
 
@@ -303 +304 @@
  */
 void ResourceManager::cache(const char* fileName, ResourceType type, ResourcePriority prio,
-             void* param1, void* param2, void* param3)
+                            const MultiType& param0, const MultiType& param1, const MultiType& param2)
 {
   assert(fileName != NULL);
@@ -310 +311 @@
   Resource* tmpResource;
   // check if we already loaded this Resource
-  tmpResource = this->locateResourceByInfo(fileName, type, param1, param2, param3);
+  tmpResource = this->locateResourceByInfo(fileName, type, param0, param1, param2);
   // otherwise load it
   if (tmpResource == NULL)
-    tmpResource = this->loadResource(fileName, type, prio, param1, param2, param3);
+    tmpResource = this->loadResource(fileName, type, prio, param0, param1, param2);
   // return cached pointer.
   if (tmpResource != NULL) // if the resource was loaded before.
@@ -326 +327 @@
  * @param type: The Type of Resource to load.
  * @param prio: The ResourcePriority of this resource (will only be increased)
+ * @param param0: an additional option to parse (see the constuctors for more help)
  * @param param1: an additional option to parse (see the constuctors for more help)
  * @param param2: an additional option to parse (see the constuctors for more help)
- * @param param3: an additional option to parse (see the constuctors for more help)
  * @returns a pointer to a desired Resource.
 */
 BaseObject* ResourceManager::load(const char* fileName, ResourceType type, ResourcePriority prio,
-                                  void* param1, void* param2, void* param3)
+                                  const MultiType& param0, const MultiType& param1, const MultiType& param2)
 {
   assert(fileName != NULL);
@@ -339 +340 @@
   Resource* tmpResource;
   // check if we already loaded this Resource
-  tmpResource = this->locateResourceByInfo(fileName, type, param1, param2, param3);
+  tmpResource = this->locateResourceByInfo(fileName, type, param0, param1, param2);
   // otherwise load it
   if (tmpResource == NULL)
-    tmpResource = this->loadResource(fileName, type, prio, param1, param2, param3);
+    tmpResource = this->loadResource(fileName, type, prio, param0, param1, param2);
   // return cached pointer.
   if (tmpResource != NULL) // if the resource was loaded before.
@@ -361 +362 @@
  * @param type: The Type of Resource to load.
  * @param prio: The ResourcePriority of this resource (will only be increased)
+ * @param param0: an additional option to parse (see the constuctors for more help)
  * @param param1: an additional option to parse (see the constuctors for more help)
  * @param param2: an additional option to parse (see the constuctors for more help)
- * @param param3: an additional option to parse (see the constuctors for more help)
  * @returns a pointer to a desired Resource.
  */
 Resource* ResourceManager::loadResource(const char* fileName, ResourceType type, ResourcePriority prio,
-    void* param1, void* param2, void* param3)
+                                        const MultiType& param0, const MultiType& param1, const MultiType& param2)
 {
   // Setting up the new Resource
@@ -385 +386 @@
 #ifndef NO_MODEL
   case OBJ:
-    if (param1)
-      tmpResource->modelSize = *(float*)param1;
-    else
-      tmpResource->modelSize = 1.0;
+    if (param0.getType() != MT_NULL)
+      tmpResource->param[0] = param0;
+    else
+      tmpResource->param[0] = 1.0f;
 
     if(ResourceManager::isFile(fullName))
-      tmpResource->pointer = new OBJModel(fullName, tmpResource->modelSize);
+      tmpResource->pointer = new OBJModel(fullName, tmpResource->param[0].getFloat());
     else
     {
       PRINTF(2)("File %s in %s does not exist. Loading a cube-Model instead\n", fileName, dataDir);
-      tmpResource->pointer = ResourceManager::load("cube", PRIM, prio, &tmpResource->modelSize);
+      tmpResource->pointer = ResourceManager::load("cube", PRIM, prio, tmpResource->param[0].getFloat());
     }
     break;
   case PRIM:
-    if (param1)
-      tmpResource->modelSize = *(float*)param1;
-    else
-      tmpResource->modelSize = 1.0;
+    if (param0 != MT_NULL)
+      tmpResource->param[0] = param0;
+    else
+      tmpResource->param[0] = 1.0f;
 
     if (!strcmp(tmpResource->name, "cube"))
-      tmpResource->pointer = new PrimitiveModel(PRIM_CUBE, tmpResource->modelSize);
+      tmpResource->pointer = new PrimitiveModel(PRIM_CUBE, tmpResource->param[0].getFloat());
     else if (!strcmp(tmpResource->name, "sphere"))
-      tmpResource->pointer = new PrimitiveModel(PRIM_SPHERE, tmpResource->modelSize);
+      tmpResource->pointer = new PrimitiveModel(PRIM_SPHERE, tmpResource->param[0].getFloat());
     else if (!strcmp(tmpResource->name, "plane"))
-      tmpResource->pointer = new PrimitiveModel(PRIM_PLANE, tmpResource->modelSize);
+      tmpResource->pointer = new PrimitiveModel(PRIM_PLANE, tmpResource->param[0].getFloat());
     else if (!strcmp(tmpResource->name, "cylinder"))
-      tmpResource->pointer = new PrimitiveModel(PRIM_CYLINDER, tmpResource->modelSize);
+      tmpResource->pointer = new PrimitiveModel(PRIM_CYLINDER, tmpResource->param[0].getFloat());
     else if (!strcmp(tmpResource->name, "cone"))
-      tmpResource->pointer = new PrimitiveModel(PRIM_CONE, tmpResource->modelSize);
+      tmpResource->pointer = new PrimitiveModel(PRIM_CONE, tmpResource->param[0].getFloat());
     break;
   case MD2:
     if(ResourceManager::isFile(fullName))
     {
-      if (param1 != NULL)
-      {
-        tmpResource->secFileName = new char[strlen((const char*)param1)+1];
-        strcpy(tmpResource->secFileName, (const char*) param1);
-      }
-      else
-        tmpResource->secFileName = NULL;
-      tmpResource->pointer = new MD2Data(fullName, tmpResource->secFileName);
+      tmpResource->param[0] = param0;
+      tmpResource->pointer = new MD2Data(fullName, tmpResource->param[0].getString());
       //               tmpResource->pointer = new MD2Model(fullName, tmpResource->secFileName);
 
@@ -433 +428 @@
 #ifndef NO_TEXT
   case TTF:
-    if (param1 != NULL)
-      tmpResource->ttfSize = *(unsigned int*)param1;
-    else
-      tmpResource->ttfSize = FONT_DEFAULT_RENDER_SIZE;
+    if (param0 != MT_NULL)
+    {
+      assert(param0.getInt() >= 0);
+      tmpResource->param[0] = param0;
+    }
+    else
+      tmpResource->param[0] = FONT_DEFAULT_RENDER_SIZE;
 
     if(isFile(fullName))
-      tmpResource->pointer = new Font(fullName, tmpResource->ttfSize);
+      tmpResource->pointer = new Font(fullName, (unsigned int) tmpResource->param[0].getInt());
     else
       PRINTF(2)("%s does not exist in %s. Not loading Font\n", fileName, this->dataDir);
@@ -456 +454 @@
 #ifndef NO_TEXTURES
   case IMAGE:
-    if (param1 != NULL)
-      tmpResource->texTarget = *(GLenum*)param1;
-    else
-      tmpResource->texTarget = GL_TEXTURE_2D;
+    if (param0 != MT_NULL)
+      tmpResource->param[0] = param0;
+    else
+      tmpResource->param[0] = GL_TEXTURE_2D;
     if(isFile(fullName))
     {
@@ -475 +473 @@
         {
           PRINTF(4)("Image %s resides to %s\n", fileName, imgName);
-          tmpResource->pointer = new Texture(imgName, tmpResource->texTarget);
+          tmpResource->pointer = new Texture(imgName, tmpResource->param[0].getInt());
           delete[] imgName;
           break;
@@ -490 +488 @@
     if(ResourceManager::isFile(fullName))
     {
-      if (param1 != NULL)
+      if (param0 != MT_NULL)
       {
-        char* secFullName = ResourceManager::getFullName((const char*)param1);
+        MultiType param = param0; /// HACK
+        char* secFullName = ResourceManager::getFullName(param.getString());
         if (ResourceManager::isFile(secFullName))
         {
-          tmpResource->secFileName = new char[strlen((const char*)param1)+1];
-          strcpy(tmpResource->secFileName, (const char*) param1);
+          tmpResource->param[0] = secFullName;
           tmpResource->pointer = new Shader(fullName, secFullName);
         }
@@ -503 +501 @@
       else
       {
-        tmpResource->secFileName = NULL;
+        tmpResource->param[0] = param0;
         tmpResource->pointer = new Shader(fullName, NULL);
       }
@@ -659 +657 @@
  * @param fileName: The name to look for
  * @param type the Type of resource to locate.
+ * @param param0: an additional option to parse (see the constuctors for more help)
  * @param param1: an additional option to parse (see the constuctors for more help)
  * @param param2: an additional option to parse (see the constuctors for more help)
- * @param param3: an additional option to parse (see the constuctors for more help)
  * @returns a Pointer to the Resource if found, NULL otherwise.
 */
 Resource* ResourceManager::locateResourceByInfo(const char* fileName, ResourceType type,
-    void* param1, void* param2, void* param3) const
+        const MultiType& param0, const MultiType& param1, const MultiType& param2) const
 {
   std::vector<Resource*>::const_iterator resource;
@@ -679 +677 @@
       case PRIM:
       case OBJ:
-        if (!param1)
+        if (param0 == MT_NULL)
         {
-          if ((*resource)->modelSize == 1.0)
+          if ((*resource)->param[0] == 1.0f)
             match = true;
         }
-        else if ((*resource)->modelSize == *(float*)param1)
+        else if ((*resource)->param[0] == param0)
           match = true;
         break;
       case MD2:
-        if (!param1)
+        if (param0 == MT_NULL)
         {
-          if ((*resource)->secFileName == NULL)
+          if ((*resource)->param[0] == "")
             match = true;
         }
-        else if (!strcmp((*resource)->secFileName, (const char*)param1))
+        else if ((*resource)->param[0] == param0)
           match = true;
         break;
@@ -699 +697 @@
 #ifndef NO_TEXT
       case TTF:
-        if (param1 == NULL)
+        if (param0 == MT_NULL)
         {
-          if ((*resource)->ttfSize == FONT_DEFAULT_RENDER_SIZE)
+          if ((*resource)->param[0] == FONT_DEFAULT_RENDER_SIZE)
             match = true;
         }
-        else if ((*resource)->ttfSize == *(unsigned int*)param1)
+        else if ((*resource)->param[0] == param0)
           match = true;
         break;
@@ -710 +708 @@
 #ifndef NO_SHADERS
       case SHADER:
-        if (!param1)
+        if (param0 == MT_NULL)
         {
-          if ((*resource)->secFileName == NULL)
+          if ((*resource)->param[0] == "")
             match = true;
         }
-        else if (!strcmp((*resource)->secFileName, (const char*)param1))
+        else if ((*resource)->param[0] == param0)
           match = true;
 #endif /* NO_SHADERS */
 #ifndef NO_TEXTURES
       case IMAGE:
-        if (!param1)
+        if (param0 == MT_NULL)
         {
-          if ((*resource)->texTarget == GL_TEXTURE_2D)
+          if ((*resource)->param[0] == GL_TEXTURE_2D)
             match = true;
         }
-        else if ((*resource)->texTarget ==  *(GLenum*)param1)
+        else if ((*resource)->param[0] ==  param0)
           match = true;
 #endif /* NO_TEXTURES */

trunk/src/util/loading/resource_manager.h

@@ -21 +21 @@
 
 #include "base_object.h"
-
+#include "multi_type.h"
 
 #include <vector>
@@ -74 +74 @@
   ResourcePriority  prio;              //!< The Priority of this resource. (This will only be increased)
 
-  // more specific
-  union {
-#ifndef NO_MODEL
-  float             modelSize;         //!< the size of the model (OBJ/PRIM)
-  char*             secFileName;       //!< a seconf fileName
-#endif /* NO_MODEL */
-#ifndef NO_TEXT
-  unsigned int      ttfSize;           //!< the size of the ttf-font (TTF)
-#endif /* NO_TEXT */
-#ifndef NO_TEXTURES
-  GLenum            texTarget;
-#endif /* NO_TEXTURES */
-  };
+  MultiType         param[3];          //!< The Parameters given to this Resource.
 };
 
@@ -117 +105 @@
 
   void cache(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
-             void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
+             const MultiType& param0 = MultiType(), const MultiType& param1 = MultiType(), const MultiType& param2 = MultiType());
 
   BaseObject* load(const char* fileName, ResourcePriority prio = RP_NO,
-               void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
+                   const MultiType& param0 = MultiType(), const MultiType& param1 = MultiType(), const MultiType& param2 = MultiType());
   BaseObject* load(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
-               void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
+                   const MultiType& param0 = MultiType(), const MultiType& param1 = MultiType(), const MultiType& param2 = MultiType());
   bool unload(void* pointer, ResourcePriority prio = RP_NO);
   bool unload(Resource* resource, ResourcePriority = RP_NO);
   bool unloadAllByPriority(ResourcePriority prio);
 
-  Resource* locateResourceByInfo(const char* fileName, ResourceType type, void* param1, void* param2, void* param3) const;
+  Resource* locateResourceByInfo(const char* fileName, ResourceType type,
+                                 const MultiType& param0 = MultiType(), const MultiType& param1 = MultiType(), const MultiType& param2 = MultiType()) const;
   Resource* locateResourceByPointer(const void* pointer) const;
 
@@ -148 +137 @@
   ResourceManager();
   Resource* loadResource(const char* fileName, ResourceType type, ResourcePriority prio,
-                     void* param1, void* param2, void* param3);
+                         const MultiType& param0, const MultiType& param1, const MultiType& param2);
 
  private:

trunk/src/world_entities/environments/water.cc

@@ -53 +53 @@
   this->rebuildGrid();
   this->waterMaterial = new Material();
-  this->waterShader = (Shader*)ResourceManager::getInstance()->load("shaders/water.vert", SHADER, RP_GAME, (void*)"shaders/water.frag");
+  this->waterShader = (Shader*)ResourceManager::getInstance()->load("shaders/water.vert", SHADER, RP_GAME, "shaders/water.frag");
 
   this->grid->height(this->grid->columns()/2,this->grid->rows()/2) = 100;