Changeset 3342 for GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter.cpp

Timestamp:

04/13/09 08:44:22 (15 years ago)

Author:

mattausch

Message:

found error

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter.cpp (modified) (3 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter.cpp

@@ -523 +523 @@
         vector<Geometry *>::const_iterator it, it_end = mGeometry.end();
 
-        Material defaultMaterial;
-
         for (it = mGeometry.begin(); it != it_end; ++ it)
         {
-
-                ///////////////////////
-                //-- write geometry
-
                 WriteGeometry(ofile, *it);
 
                 
                 /////////
-                //-- write material
-
-                Material *mat = (*it)->mMaterial ? (*it)->mMaterial : &defaultMaterial;
+                //-- material
+
+                Material *mat = (*it)->mMaterial;
+
+                if (!mat) cerr << "error: no material specified!!" << endl;
 
                 ofile.write(reinterpret_cast<char *>(&mat->texture), sizeof(int));
@@ -544 +540 @@
                 //bool cullFaceEnabled = false;
                 bool cullFaceEnabled = true;
-
+                
                 ofile.write(reinterpret_cast<char *>(&alphaTestEnabled), sizeof(bool));
                 ofile.write(reinterpret_cast<char *>(&cullFaceEnabled), sizeof(bool));
@@ -551 +547 @@
                 bool hasMaterial = true;
                 ofile.write(reinterpret_cast<char *>(&hasMaterial), sizeof(bool));
-
+        
                 SimpleVec ambient, diffuse, spec, emm;
 
                 ambient.x = ambient.y = ambient.z = 0.2f;
                 //diffuse.x = diffuse.y = diffuse.z = 1.0f;
-                diffuse.x = mat->rgb[0]; diffuse.y = mat->rgb[1]; diffuse.z = mat->rgb[2];
+                diffuse.x = mat->rgb[0]; diffuse.y =mat->rgb[1]; diffuse.z = mat->rgb[2];
                 spec.x = spec.y = spec.z = .0f;
                 emm = spec;