Changeset 3076 for GTP

Timestamp:

10/27/08 18:39:14 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter/ObjConverter.cpp (modified) (6 diffs)
• Converter/main.cpp (modified) (2 diffs)
• src/chcdemo.cpp (modified) (5 diffs)

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

@@ -70 +70 @@
                 if (indices.size() > 2)
                 {
+                        // change orientation of faces?
 #if 1
                         int idx1 = 0;
@@ -150 +151 @@
         {
 #if 0
+                // convert to our camera system: change y and z
                 geom->mVertices[i].x = faceVertices[i].x;
                 geom->mVertices[i].y = -faceVertices[i].z;
@@ -236 +238 @@
         while (fgets(str, len, file) != NULL)
         {
-                //cout << str;
+                if (1)//(line % 100) == 0)
+                        cout << "read line " << line << " " << str;
                 switch (str[0]) 
                 {
@@ -283 +286 @@
                                 break;
                         }   // end face
-                case 'g':
+                case 'g': // load a new shape
                         {/*
                                 if (!faceVertices.empty())
@@ -351 +354 @@
 
         // material
-        //bool hasMaterial = true;
-        bool hasMaterial = false;
+        bool hasMaterial = true;
+        //bool hasMaterial = false;
         str.write(reinterpret_cast<char *>(&hasMaterial), sizeof(bool));
         
@@ -390 +393 @@
         if (textureCount > 0)
         {
+                // hack
                 const string texName("wood.jpg");
 

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

@@ -1 +1 @@
 #include "ObjConverter.h"
 #include <iostream>
-
+#include <time.h>
 
 using namespace std;
@@ -18 +18 @@
         {
                 cerr << "conversion failed" << endl;
+
+                std::cin.get();
                 exit(0);
         }
 
         cout << "conversion successful" << endl;
+
         return 0;
 }

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

@@ -455 +455 @@
         //-- load some dynamic stuff
 
-        LoadModel("hbuddha.dem", dynamicObjects);
+        /*LoadModel("hbuddha.dem", dynamicObjects);
         buddha = dynamicObjects.back();
         
@@ -479 +479 @@
         }
 
-
+*/
         ///////////
         //-- load the associated static bvh
@@ -868 +868 @@
 void MainLoop() 
 {       
-        Vector3 offs = Vector3::ZERO();
+        /*Vector3 offs = Vector3::ZERO();
         offs.x = RandomValue(-.1f, .1f);
         offs.y = RandomValue(-.1f, .1f);
@@ -875 +875 @@
 
         Matrix4x4 mat = TranslationMatrix(offs);
-                
         buddha->GetTransform()->MultMatrix(mat);
-
+*/
         Vector3 oldPos = camera->GetPosition();
 
@@ -925 +924 @@
         /// enable vbo vertex array
         glEnableClientState(GL_VERTEX_ARRAY);
+
 
         // render with the specified method (forward rendering, forward + depth, deferred)