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

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

Files:

• material.cc (modified) (10 diffs)
• material.h (modified) (2 diffs)
• model.cc (modified) (10 diffs)
• texture.h (modified) (1 diff)

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: