Changeset 3335 for GTP

Timestamp:

03/09/09 18:45:10 (15 years ago)

Author:

mattausch

Message:

adding torus

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter/ObjConverter.cpp (modified) (3 diffs)
• Converter/ObjConverter2.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (2 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);
 
                 
                 /////////
-                //-- material
-
-                Material *mat = (*it)->mMaterial;
-
-                if (!mat) cerr << "error: no material specified!!" << endl;
+                //-- write material
+
+                Material *mat = (*it)->mMaterial ? (*it)->mMaterial : &defaultMaterial;
 
                 ofile.write(reinterpret_cast<char *>(&mat->texture), sizeof(int));
@@ -540 +544 @@
                 //bool cullFaceEnabled = false;
                 bool cullFaceEnabled = true;
-                
+
                 ofile.write(reinterpret_cast<char *>(&alphaTestEnabled), sizeof(bool));
                 ofile.write(reinterpret_cast<char *>(&cullFaceEnabled), sizeof(bool));
@@ -547 +551 @@
                 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;

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

@@ -486 +486 @@
                 Material *mat = (*it)->mMaterial;
 
-                if (!mat) cerr << "error: no material specified!!" << endl;
+                if (!mat) cerr << "error: no material associated with this geometry!!" << endl;
 
                 ofile.write(reinterpret_cast<char *>(&mat->texture), sizeof(int));

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -657 +657 @@
         Matrix4x4 transl = TranslationMatrix(positions[0]);
         
-        LoadModel("hbuddha.dem", dynamicObjects);
+        //LoadModel("hbuddha.dem", dynamicObjects);
+        LoadModel("torus.dem", dynamicObjects);
         //LoadModel("venusm.dem", dynamicObjects);
 
@@ -1174 +1175 @@
                 dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
 
+                const float rotAngle2 = 0.6f * M_PI / 180.0f;
+
+                Matrix4x4 rotMatrix2 = RotationZMatrix(rotAngle);
+                // hack: second buddha
+                dynamicObjects[3]->GetTransform()->MultMatrix(rotMatrix2);
+
+
                 //const float moveSpeed = 5e-3f;
                 const float moveSpeed = 1e-1f;