Changeset 5308 in orxonox.OLD for trunk/src/lib/graphics/importer/material.cc

Timestamp:

Oct 8, 2005, 12:32:52 AM (20 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

File:

• trunk/src/lib/graphics/importer/material.cc (modified) (10 diffs)

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