Changeset 3374 for GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter

Timestamp:

05/27/09 00:36:21 (16 years ago)

Author:

mattausch

Message:

testing city

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter

Files:

• ObjConverter.cpp (modified) (2 diffs)
• main.cpp (modified) (2 diffs)

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

@@ -172 +172 @@
         for (int i = 0; i < numElements; ++ i)
         {
-#if 0
+#if 1
                 // convert to our camera system: change y and z
-                geom->mVertices[i].x = faceVertices[i].x;
+                geom->mVertices[i].x =  faceVertices[i].x;
                 geom->mVertices[i].y = -faceVertices[i].z;
-                geom->mVertices[i].z = faceVertices[i].y;
-        
-                geom->mNormals[i].x = faceNormals[i].x;
+                geom->mVertices[i].z =  faceVertices[i].y;
+        
+                geom->mNormals[i].x =  faceNormals[i].x;
                 geom->mNormals[i].y = -faceNormals[i].z;
-                geom->mNormals[i].z = faceNormals[i].y;
+                geom->mNormals[i].z =  faceNormals[i].y;
 
 #else
-                geom->mVertices[i].x = faceVertices[i].x;
-                geom->mVertices[i].y = faceVertices[i].y;
-                geom->mVertices[i].z = faceVertices[i].z;
-        
-                geom->mNormals[i].x = faceNormals[i].x;
-                geom->mNormals[i].y = faceNormals[i].y;
-                geom->mNormals[i].z = faceNormals[i].z;
+                geom->mVertices[i].x =  faceVertices[i].x;
+                geom->mVertices[i].y =  faceVertices[i].y;
+                geom->mVertices[i].z =  faceVertices[i].z;
+        
+                geom->mNormals[i].x =  faceNormals[i].x;
+                geom->mNormals[i].y =  faceNormals[i].y;
+                geom->mNormals[i].z =  faceNormals[i].z;
 
 #endif
@@ -294 +294 @@
                 case 'g': // load a new shape
                         {
-                                if (!faceVertices.empty())
+                                if (0 && !faceVertices.empty())
                                 {
                                         ++ mNumShapes;

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

@@ -1 @@
-//#include "ObjConverter.h"
-#include "PlyConverter.h"
+#include "ObjConverter.h"
+//#include "PlyConverter.h"
 #include <iostream>
 #include <time.h>
@@ -12 +12 @@
 
         //ObjConverter2 converter;
-        //ObjConverter converter;
-        PlyConverter converter;
+        ObjConverter converter;
+        //PlyConverter converter;
 
         cout << "converting obj to dem format" << endl;