Changeset 3153 for GTP/trunk/App/Demos/Vis/FriendlyCulling/VboFormatConverter

Timestamp:

11/21/08 17:43:49 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/VboFormatConverter

Files:

• VboFormatConverter.cpp (modified) (4 diffs)
• main.cpp (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/VboFormatConverter/VboFormatConverter.cpp

@@ -82 +82 @@
         // convert the triangles to geometry
         geom->mVertexCount = numElements;
+        geom->mTexcoordCount = numElements;
+
         geom->mVertices = new SimpleVec[numElements];
         geom->mNormals = new SimpleVec[numElements];
@@ -94 +96 @@
         {
                 sscanf(str, "%f %f %f %f %f %f %f %f %f %f %f", 
-                       &vtx.x, &vtx.z, &vtx.y, 
-                           &normal.x, &normal.z, &normal.y, 
+                       &vtx.x, &vtx.y, &vtx.z, 
+                           &normal.x, &normal.y, &normal.z, 
                            &tex.first, &tex.second,
                            &tangent.x, &tangent.y, &tangent.z);
 
                 const float scale = 0.05f;
-                vtx.x *= scale;
-                vtx.y *= scale;
-                vtx.z *= scale;
-
-                geom->mVertices[line] = vtx;
-                geom->mNormals[line] = normal;
+                
+                geom->mVertices[line].x = vtx.x * scale;
+                geom->mVertices[line].y = vtx.z * scale;
+                geom->mVertices[line].z = vtx.y * scale;
+        
+                geom->mNormals[line].x = normal.x;
+                geom->mNormals[line].y = normal.z;
+                geom->mNormals[line].z = normal.y;
+
+                geom->mTangents[line].x = tangent.x;
+                geom->mTangents[line].y = tangent.z;
+                geom->mTangents[line].z = tangent.y;
+
                 geom->mTexcoords[line] = tex;
-                geom->mTangents[line] = tangent;
-
+
+                static int dummy = 0;
+
+                if (dummy ++ < 5) cout << "tangent: " << geom->mTangents[line] << endl;
                 ++ line;
         }
@@ -134 +145 @@
 
         if (texCoordCount)
+        {
                 str.write(reinterpret_cast<char *>(geom->mTexcoords), sizeof(float) * texCoordCount * 2);
-        
+        }
+
 
         ///////
@@ -163 +176 @@
 
                 ambient.x = ambient.y = ambient.z = 0.2f;
-                diffuse.x = diffuse.y = diffuse.z = 1.0f;
+                diffuse.x = 0.7f; diffuse.y = 0.4f; diffuse.z = 0.2f;
                 spec.x   = spec.y   = spec.z   =  .0f;
                 emm = spec;

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

@@ -22 +22 @@
                 exit(0);
         }
-
+        
+        std::cin.get();
         cout << "conversion successful" << endl;