Changeset 5308 in orxonox.OLD

Timestamp:

Oct 8, 2005, 12:32:52 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Fixed a reversive BUG in the ResourceManager:
Since resources, that depend on each other are loaded left tgo right they must be unlinked right to left… this cost me 3 hours.
What a luck i found this

Location:

trunk/src

Files:

• glmenu/glmenu_imagescreen.cc (modified) (1 diff)
• lib/graphics/importer/material.cc (modified) (10 diffs)
• lib/graphics/importer/material.h (modified) (2 diffs)
• lib/graphics/importer/model.cc (modified) (10 diffs)
• lib/graphics/importer/texture.h (modified) (1 diff)
• util/resource_manager.cc (modified) (8 diffs)
• util/resource_manager.h (modified) (4 diffs)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/terrain.cc (modified) (6 diffs)
• world_entities/terrain.h (modified) (1 diff)

trunk/src/glmenu/glmenu_imagescreen.cc

@@ -284 +284 @@
   SDL_GL_SwapBuffers();
 }
-
-

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

@@ -57 +57 @@
 Material::~Material()
 {
-  PRINTF(4)("delete Material %s.\n", this->getName());
+  PRINTF(5)("delete Material %s.\n", this->getName());
 
   if (this->diffuseTexture != NULL)
+  {
     ResourceManager::getInstance()->unload(this->diffuseTexture);
+  }
   if (this->ambientTexture != NULL)
     ResourceManager::getInstance()->unload(this->ambientTexture);
@@ -69 +71 @@
 /**
  *  sets the material with which the following Faces will be painted
-*/
-bool Material::select ()
+ */
+bool Material::select () const
 {
   // setting diffuse color
@@ -127 +129 @@
  *  Sets the Material Illumination Model.
  *  illu illumination Model in int form
-*/
+ */
 void Material::setIllum (int illum)
 {
@@ -133 +135 @@
   this->illumModel = illum;
 }
+
 /**
  *  Sets the Material Illumination Model.
  *  illu illumination Model in char* form
-*/void Material::setIllum (char* illum)
+ */
+void Material::setIllum (char* illum)
 {
   this->setIllum (atoi(illum));
@@ -146 +150 @@
  * @param g Green Color Channel.
  * @param b Blue Color Channel.
-*/
+ */
 void Material::setDiffuse (float r, float g, float b)
 {
@@ -156 +160 @@
 
 }
+
 /**
  *  Sets the Material Diffuse Color.
  * @param rgb The red, green, blue channel in char format (with spaces between them)
-*/
+ */
 void Material::setDiffuse (char* rgb)
 {
@@ -181 +186 @@
   this->ambient[3] = 1.0;
 }
+
 /**
  *  Sets the Material Ambient Color.
  * @param rgb The red, green, blue channel in char format (with spaces between them)
-*/
+ */
 void Material::setAmbient (char* rgb)
 {
@@ -197 +203 @@
  * @param g Green Color Channel.
  * @param b Blue Color Channel.
-*/
+ */
 void Material::setSpecular (float r, float g, float b)
 {
@@ -206 +212 @@
   this->specular[3] = 1.0;
  }
+
 /**
  *  Sets the Material Specular Color.
@@ -269 +276 @@
 void Material::setDiffuseMap(const char* dMap)
 {
-  PRINTF(4)("setting Diffuse Map %s\n", dMap);
+  PRINTF(5)("setting Diffuse Map %s\n", dMap);
   if (this->diffuseTexture != NULL)
     ResourceManager::getInstance()->unload(this->diffuseTexture);

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

@@ -26 +26 @@
  public:
   Material (const char* mtlName = NULL);
-  ~Material ();
+  virtual ~Material ();
 
-  bool select ();
+  bool select () const;
 
   void setIllum (int illum);
@@ -58 +58 @@
   float       shininess;        //!< The shininess of the Material.
   float       transparency;     //!< The transperency of the Material.
-
+  public:
   Texture*    diffuseTexture;   //!< The diffuse texture of the Material.
   Texture*    ambientTexture;   //!< The ambient texture of the Material.

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

@@ -65 +65 @@
 
   this->next = NULL;
-
 }
 
@@ -383 +382 @@
 //////////
 /**
- *  adds a new Material to the Material List
+ * adds a new Material to the Material List
  * @param material the Material to add
  * @returns the added material
@@ -392 +391 @@
 Material* Model::addMaterial(Material* material)
 {
+  if (material == NULL)
+    return NULL;
   ModelMaterial* modMat = new ModelMaterial;
   modMat->external = true;
@@ -408 +409 @@
   ModelMaterial* modMat = new ModelMaterial;
   modMat->external = false;
-  modMat->material = new Material();
-  modMat->material->setName(materialName);
+  modMat->material = new Material(materialName);
 
   // adding material to the List of materials
@@ -474 +474 @@
   float subbuffer3;
   sscanf (vertexString, "%f %f %f", &subbuffer1, &subbuffer2, &subbuffer3);
-  PRINTF(5)("reading in a vertex: %f %f %f\n", &subbuffer1, &subbuffer2, &subbuffer3);
   this->vertices->addEntry(subbuffer1*scaleFactor, subbuffer2*scaleFactor, subbuffer3*scaleFactor);
   this->vertexCount++;
@@ -507 +506 @@
   float subbuffer3;
   sscanf (normalString, "%f %f %f", &subbuffer1, &subbuffer2, &subbuffer3);
-  PRINTF(5)("found vertex-Normal %f, %f, %f\n", &subbuffer1,&subbuffer2,&subbuffer3);
   this->normals->addEntry(subbuffer1, subbuffer2, subbuffer3);
   this->normalCount++;
@@ -543 +541 @@
   float subbuffer2;
   sscanf (vTextureString, "%f %f", &subbuffer1, &subbuffer2);
-  PRINTF(5)("found vertex-Texture %f, %f\n", &subbuffer1, &subbuffer2);
   this->vTexture->addEntry(subbuffer1);
   this->vTexture->addEntry(1 - subbuffer2);
@@ -659 +656 @@
 
 /**
- *  Function that selects a material, if changed in the obj file.
+ * Function that selects a material, if changed in the obj file.
  * @param matString the Material that will be set.
 */
@@ -674 +671 @@
 
 /**
- *  Function that selects a material, if changed in the obj file.
+ * Function that selects a material, if changed in the obj file.
  * @param mtl the Material that will be set.
 */
@@ -1106 +1103 @@
   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,16, 7,10,17, 5,11,18, 3,3,19);
   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,12,20, 0,0,21, 2,2,22, 4,13,23);
-
-}
+}

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

@@ -21 +21 @@
 
 //! A Class, that reads in Textures from different fileformats.
-class Texture : public  BaseObject
+class Texture : public BaseObject
 {
  public:

trunk/src/util/resource_manager.cc

@@ -251 +251 @@
     {
       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)
@@ -409 +408 @@
     }
   else
-    unload(tmpResource, prio);
+    return unload(tmpResource, prio);
 }
 
@@ -416 +415 @@
  * @param resource: The resource to unloade
  * @param prio the PriorityLevel to unload this resource
+ * @returns true on success, false otherwise.
 */
 bool ResourceManager::unload(Resource* resource, ResourcePriority prio)
@@ -421 +421 @@
   if (resource == NULL)
     return false;
-//  printf("removing %s count: %d\n", resource->pointer->getName(),  resource->count);
   if (resource->count > 0)
     resource->count--;
@@ -427 +426 @@
   if (resource->prio <= prio)
     {
-      if (resource->count <= 0)
+      if (resource->count == 0)
         {
           // deleting the Resource
@@ -480 +479 @@
 
 /**
- *  unloads all alocated Memory of Resources with a pririty lower than prio
+ * unloads all alocated Memory of Resources with a pririty lower than prio
  * @param prio The priority to delete
 */
@@ -486 +485 @@
 {
   tIterator<Resource>* iterator = resourceList->getIterator();
-  Resource* enumRes = iterator->firstElement();
+  Resource* enumRes = iterator->lastElement();
   while (enumRes)
     {
@@ -496 +495 @@
                    enumRes->name, enumRes->count);
       //enumRes = resourceList->nextElement();
-      enumRes = iterator->nextElement();
+      enumRes = iterator->prevElement();
     }
   delete iterator;

trunk/src/util/resource_manager.h

@@ -66 +66 @@
 {
   BaseObject*       pointer;           //!< Pointer to the Resource.
-  int               count;             //!< How many times this Resource has been loaded.
+  unsigned int      count;             //!< How many times this Resource has been loaded.
 
   char*             name;              //!< Name of the Resource.
@@ -85 +85 @@
 //! The ResourceManager is a class, that decides if a file/resource should be loaded
 /**
-   If a file/resource was already loaded the resourceManager will
-   return a void pointer to the desired resource.
-   Otherwise it will instruct the corresponding resource-loader to load,
-   and receive the pointer to it.
-
-   It does it by looking, if a desired file has already been loaded.
-*/
+ * If a file/resource was already loaded the resourceManager will
+ * return a pointer to the desired resource.
+ * Otherwise it will instruct the corresponding resource-loader to load,
+ * and receive the pointer to it.
+ *
+ * It does it by looking, if a desired file has already been loaded.
+ * There is also the possibility to check for some variables
+ */
 class ResourceManager : public BaseObject
 {
@@ -101 +102 @@
   bool setDataDir(const char* dataDir);
   /** @returns the Name of the data directory */
-  inline const char* getDataDir() const {return this->dataDir;}
+  inline const char* getDataDir() const { return this->dataDir; };
 
   bool checkDataDir(const char* fileInside);
@@ -135 +136 @@
   static ResourceManager*  singletonRef;       //!< singleton Reference
 
+  char*                    dataDir;            //!< The Data Directory, where all relevant Data is stored.
   tList<Resource>*         resourceList;       //!< The List of Resources, that has already been loaded.
-  char*                    dataDir;            //!< The Data Directory, where all relevant Data is stored.
   tList<char>*             imageDirs;          //!< A list of directories in which images are stored.
 

trunk/src/world_entities/environment.cc

@@ -34 +34 @@
 {
   this->setClassID(CL_ENVIRONMENT, "Environment");
-  this->model = (Model*)ResourceManager::getInstance()->load("models/ships/bolido.obj", OBJ, RP_CAMPAIGN);
+  this->loadModel("models/ships/bolido.obj");
 
 /*  if(this->obbTree == NULL)

trunk/src/world_entities/skybox.cc

@@ -101 +101 @@
   for (int i = 0; i < 6; i++)
     delete this->material[i];
-  delete []this->material;
+  delete[] this->material;
   delete this->model;
   this->model = NULL; //< so that WorldEntity does not try to delete it again.

trunk/src/world_entities/terrain.cc

@@ -39 +39 @@
   this->loadParams(root);
 
-  this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);
+//  if (this->model != NULL)
+    //this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);
 }
 
@@ -53 +54 @@
   this->init();
 
-  if (strstr(fileName, ".obj") || strstr(fileName, ".OBJ"))
-    {
-      this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_LEVEL);
+  if (!strcasestr(fileName, ".obj") )
+    {
+      this->loadModel(fileName);
     }
   else
@@ -65 +66 @@
 /**
  *  a Constructor for the Debug-Worlds
-
-   @todo make it not compileable when not in debug-mode
-*/
+ */
 Terrain::Terrain(DebugTerrain debugTerrain)
 {
@@ -92 +91 @@
 
   this->objectList = 0;
+  this->ssp = NULL;
 }
 
@@ -122 +122 @@
 
   /* THIS IS ONLY FOR DEBUGGING INFORMATION */
-  this->ssp->drawQuadtree();
+  if (this->ssp != NULL)
+    this->ssp->drawQuadtree();
 }
 
@@ -289 +290 @@
       */
     }
-
-}
+}

trunk/src/world_entities/terrain.h

@@ -42 +42 @@
  private:
   int objectList;
-
 };