Changeset 6645 in orxonox.OLD for trunk/src/lib

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/lib

Files:

• graphics/importer/material.cc (modified) (1 diff)
• graphics/importer/md2Model.cc (modified) (1 diff)
• graphics/shader.cc (modified) (1 diff)
• graphics/text_engine/text.cc (modified) (1 diff)
• util/executor/executor.cc (modified) (1 diff)
• util/multi_type.cc (modified) (1 diff)
• util/multi_type.h (modified) (2 diffs)

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);