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

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

File:

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

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