Changeset 5304 in orxonox.OLD for trunk

Timestamp:

Oct 7, 2005, 3:28:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: so, ResourceManager now operates on BaseObjects. If this is better, i do not know, but at least it is more intuitive, i think

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/graphics/importer/md2Model.h (modified) (1 diff)
• lib/graphics/importer/model.cc (modified) (5 diffs)
• lib/graphics/importer/model.h (modified) (2 diffs)
• lib/graphics/importer/texture.cc (modified) (1 diff)
• lib/graphics/importer/texture.h (modified) (2 diffs)
• util/resource_manager.cc (modified) (3 diffs)
• util/resource_manager.h (modified) (2 diffs)

trunk/src/defs/class_id.h

@@ -161 +161 @@
   CL_TEXT                       =    0x00b01801,
   CL_FONT                       =    0x00000802,
-  CL_MATERIAL                   =    0x00000803,
-  CL_MODEL                      =    0x00000804, //!< @todo make this a SUBCLASS maybe
-  CL_OBJMODEL                   =    0x00000805,
-  CL_PROMITIVE_MODEL            =    0x00000806,
-  CL_MD2Model                   =    0x00000807,
-  CL_LIGHT                      =    0x00000808,
-  CL_PARTICLE_EMITTER           =    0x00000809,
+  CL_TEXTURE                    =    0x00000803,
+  CL_MATERIAL                   =    0x00000804,
+  CL_MODEL                      =    0x00000805, //!< @todo make this a SUBCLASS maybe
+  CL_OBJMODEL                   =    0x00000806,
+  CL_PROMITIVE_MODEL            =    0x00000807,
+  CL_MD2Model                   =    0x00000808,
+  CL_LIGHT                      =    0x00000809,
+  CL_PARTICLE_EMITTER           =    0x0000080a,
   CL_PARTICLE_SYSTEM            =    0x0000080a,
   CL_ENVIRONMENT                =    0x00000810,

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

@@ -103 +103 @@
 
 //! class to store the md2 data in
-class MD2Data
+class MD2Data : public BaseObject
 {
  public:

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

@@ -167 +167 @@
   this->normals = new Array<GLfloat>();
 
-  this->materialList = new tList<Material>;
-  this->materialsExtern = false;
+  this->materialList = new tList<ModelMaterial>;
 
   if (this->type == MODEL_VERTEX_ARRAY)
@@ -196 +195 @@
 
   // deleting the MaterialList
-  if (!this->materialsExtern)
+  PRINTF(5)("Deleting Materials.\n");
+
+  tIterator<ModelMaterial>* tmpIt = this->materialList->getIterator();
+  ModelMaterial* modMat = tmpIt->firstElement();
+  //! @todo do we really have to delete this material??
+  while(modMat != NULL)
   {
-    PRINTF(5)("Deleting Materials.\n");
-
-    tIterator<Material>* tmpIt = this->materialList->getIterator();
-    Material* material = tmpIt->firstElement();
-  //! @todo do we really have to delete this material??
-    while(material)
-    {
-      delete material;
-      material = tmpIt->nextElement();
-    }
-    delete tmpIt;
+    if (!modMat->external)
+      delete modMat->material;
+    delete modMat;
+    modMat = tmpIt->nextElement();
   }
+  delete tmpIt;
   delete materialList;
   delete this->pModelInfo;
@@ -391 +389 @@
  * this also tells this Model, that all the Materials are handled externally
  * with this option set the Materials will not be deleted with the Model.
- * !! -> NO MATERIALS GET DELETED WITH ONE CALL TO THIS FUNCTION !!
-*/
+ */
 Material* Model::addMaterial(Material* material)
 {
-  this->materialList->add(material);
-  this->materialsExtern = true;
-  return material;
+  ModelMaterial* modMat = new ModelMaterial;
+  modMat->external = true;
+  modMat->material = material;
+  this->materialList->add(modMat);
+  return modMat->material;
 }
 
@@ -407 +406 @@
 Material* Model::addMaterial(const char* materialName)
 {
-  Material* newMat = new Material();
-  newMat->setName(materialName);
+  ModelMaterial* modMat = new ModelMaterial;
+  modMat->external = false;
+  modMat->material = new Material();
+  modMat->material->setName(materialName);
 
   // adding material to the List of materials
-  this->materialList->add(newMat);
-  return newMat;
+  this->materialList->add(modMat);
+  return modMat->material;
 }
 
@@ -422 +423 @@
 Material* Model::findMaterialByName(const char* materialName)
 {
-  tIterator<Material>* tmpIt = this->materialList->getIterator();
-  Material* material = tmpIt->firstElement();
-  while(material)
-    {
-      if (!strcmp(material->getName(), materialName))
+  tIterator<ModelMaterial>* tmpIt = this->materialList->getIterator();
+  ModelMaterial* modMat = tmpIt->firstElement();
+  while(modMat != NULL)
+    {
+      if (!strcmp(modMat->material->getName(), materialName))
         {
           delete tmpIt;
-          return material;
+          return modMat->material;
         }
-      material = tmpIt->nextElement();
+      modMat = tmpIt->nextElement();
     }
   delete tmpIt;

trunk/src/lib/graphics/importer/model.h

@@ -96 +96 @@
 };
 
+struct ModelMaterial
+{
+  Material* material;
+  bool external;
+};
+
 /////////////
 /// MODEL ///
 /////////////
-
 //! Class that handles 3D-Models. it can also read them in and display them.
 class Model : public AbstractModel
@@ -172 +177 @@
 
  private:
-  MODEL_TYPE       type;            //!< A type for the Model
-  bool             finalized;       //!< Sets the Object to be finalized.
+  MODEL_TYPE             type;            //!< A type for the Model
+  bool                   finalized;       //!< Sets the Object to be finalized.
 
-  unsigned int     vertexCount;     //!< A modelwide Counter for vertices.
-  unsigned int     normalCount;     //!< A modelwide Counter for the normals.
-  unsigned int     texCoordCount;   //!< A modelwide Counter for the texCoord.
-  unsigned int     faceCount;       //!< A modelwide Counter for the faces
-  unsigned int     triangleCount;   //!< Number of triangles >= faceCount
-  Array<GLfloat>*  vertices;        //!< The Array that handles the Vertices.
-  Array<GLfloat>*  normals;         //!< The Array that handles the Normals.
-  Array<GLfloat>*  vTexture;        //!< The Array that handles the VertexTextureCoordinates.
-  sTriangleExt*    triangles;       //!< The Array of triangles in the abstract_model.h style
+  unsigned int           vertexCount;     //!< A modelwide Counter for vertices.
+  unsigned int           normalCount;     //!< A modelwide Counter for the normals.
+  unsigned int           texCoordCount;   //!< A modelwide Counter for the texCoord.
+  unsigned int           faceCount;       //!< A modelwide Counter for the faces
+  unsigned int           triangleCount;   //!< Number of triangles >= faceCount
+  Array<GLfloat>*        vertices;        //!< The Array that handles the Vertices.
+  Array<GLfloat>*        normals;         //!< The Array that handles the Normals.
+  Array<GLfloat>*        vTexture;        //!< The Array that handles the VertexTextureCoordinates.
+  sTriangleExt*          triangles;       //!< The Array of triangles in the abstract_model.h style
 
-  ModelGroup*      firstGroup;      //!< The first of all groups.
-  ModelGroup*      currentGroup;    //!< The currentGroup. this is the one we will work with.
-  int              groupCount;      //!< The Count of Groups.
+  ModelGroup*            firstGroup;      //!< The first of all groups.
+  ModelGroup*            currentGroup;    //!< The currentGroup. this is the one we will work with.
+  int                    groupCount;      //!< The Count of Groups.
 
-  tList<Material>* materialList;    //!< A list for all the Materials in this Model
-  bool             materialsExtern; //!< If the materials given to this Object are extern.
+  tList<ModelMaterial>*  materialList;    //!< A list for all the Materials in this Model
 };
 

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

@@ -32 +32 @@
 Texture::Texture(const char* imageName)
 {
+  this->setClassID(CL_TEXTURE, "Texture");
+
   this->bAlpha = false;
   this->texture = 0;

trunk/src/lib/graphics/importer/texture.h

@@ -10 +10 @@
 
 #include "glincl.h"
+#include "base_object.h"
 
 #include "debug.h"
@@ -20 +21 @@
 
 //! A Class, that reads in Textures from different fileformats.
-class Texture
+class Texture : public  BaseObject
 {
  public:

trunk/src/util/resource_manager.cc

@@ -73 +73 @@
 
   if (this->resourceList->getSize() > 0)
-    PRINTF(1)("Not removed all Textures, since there are still %d resources registered\n", this->resourceList->getSize());
+    PRINTF(1)("Not removed all Resources, since there are still %d resources registered\n", this->resourceList->getSize());
 
   delete this->resourceList;
@@ -185 +185 @@
  * @returns a pointer to a desired Resource.
 */
-void* ResourceManager::load(const char* fileName, ResourcePriority prio, void* param1, void* param2, void* param3)
+BaseObject* ResourceManager::load(const char* fileName, ResourcePriority prio, void* param1, void* param2, void* param3)
 {
   ResourceType tmpType;
@@ -243 +243 @@
  * @returns a pointer to a desired Resource.
 */
-void* ResourceManager::load(const char* fileName, ResourceType type, ResourcePriority prio,
+BaseObject* ResourceManager::load(const char* fileName, ResourceType type, ResourcePriority prio,
                             void* param1, void* param2, void* param3)
 {

trunk/src/util/resource_manager.h

@@ -65 +65 @@
 struct Resource
 {
-  void*             pointer;           //!< Pointer to the Resource.
+  BaseObject*       pointer;           //!< Pointer to the Resource.
   int               count;             //!< How many times this Resource has been loaded.
 
@@ -105 +105 @@
   bool checkDataDir(const char* fileInside);
   bool addImageDir(const char* imageDir);
-  void* load(const char* fileName, ResourcePriority prio = RP_NO,
+  BaseObject* load(const char* fileName, ResourcePriority prio = RP_NO,
              void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
-  void* load(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
+  BaseObject* load(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
              void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
   bool unload(void* pointer, ResourcePriority prio = RP_NO);