Changeset 3012

Timestamp:

10/08/08 10:45:08 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter.vcproj (modified) (2 diffs)
• Converter/ObjConverter.cpp (modified) (13 diffs)
• Converter/ObjConverter.h (modified) (2 diffs)
• Converter/SimpleTri.cpp (added)
• Converter/SimpleTri.h (added)
• Converter/SimpleVec.cpp (added)
• Converter/SimpleVec.h (added)
• Converter/main.cpp (modified) (1 diff)
• FriendlyCulling.sln (modified) (2 diffs)
• MainApp.vcproj (modified) (2 diffs)
• src/chcdemo.cpp (modified) (4 diffs)

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

@@ -197 +197 @@
                                 >
                         </File>
+                        <File
+                                RelativePath=".\Converter\SimpleTri.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\Converter\SimpleVec.cpp"
+                                >
+                        </File>
                 </Filter>
                 <Filter
@@ -211 +219 @@
                                 >
                         </File>
+                        <File
+                                RelativePath=".\Converter\SimpleTri.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\Converter\SimpleVec.h"
+                                >
+                        </File>
                 </Filter>
         </Files>

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

@@ -1 +1 @@
 #include "ObjConverter.h"
+#include "SimpleTri.h"
+#include "SimpleVec.h"
 #include "gzstream.h"
 #include <iostream>
@@ -35 +37 @@
         for (size_t i = 0; i < substrings.size(); ++ i)
         {
-                // vertex, normal and texture indices
+                // vertex, normal, texture indices
                 char *str = strtok_s(substrings[i], "/", &next_token);    
                 int index = (int)strtol(str, NULL, 10) - 1;
@@ -42 +44 @@
                 int nIndex = index;
 
-                /*str = strtok_s(substrings[i], "/", &next_token);        
-                int tIndex = (int)strtol(str, NULL, 10) - 1;
-
                 str = strtok_s(substrings[i], "/", &next_token);          
-                int nIndex = (int)strtol(str, NULL, 10) - 1;
-*/
+
+                if (str != NULL)
+                {
+                        int idx = (int)strtol(str, NULL, 10) - 1;
+                        if (idx) tIndex = idx;
+                }
+                str = strtok_s(substrings[i], "/", &next_token);          
+
+                if (str != NULL)
+                {
+                        int idx = (int)strtol(str, NULL, 10) - 1;
+                        if (idx) nIndex = idx;
+                }
+
                 // store indices
                 if (index >= 0)
@@ -59 +70 @@
                 if (indices.size() > 2)
                 {
-#if 1
+#if 0
                         int idx1 = 0;
                         int idx2 = (int)indices.size() - 2;
@@ -71 +82 @@
                         faceVertices.push_back(vertices[indices[idx2]]);
                         faceVertices.push_back(vertices[indices[idx3]]);
-        
-                        Vector3 dummy(1, 0, 0);
-                        faceNormals.push_back(dummy);
-                        faceNormals.push_back(dummy);
-                        faceNormals.push_back(dummy);
-
-                        /*
-                        const Vector3 v2 = mVertices[2] - mVertices[1];
-                        Normalize(CrossProd(v2, v1));
-
-                        faceNormals.push_back(normals[nIndices[idx1]]);
-                        faceNormals.push_back(normals[nIndices[idx2]]);
-                        faceNormals.push_back(normals[nIndices[idx3]]);
-
-                        faceTexcoords.push_back(texcoords[tIndices[idx1]]);
-                        faceTexcoords.push_back(texcoords[tIndices[idx2]]);
-                        faceTexcoords.push_back(texcoords[tIndices[idx3]]);
-                        */
+
+                        if (!normals.empty())
+                        {
+                                faceNormals.push_back(normals[nIndices[idx1]]);
+                                faceNormals.push_back(normals[nIndices[idx2]]);
+                                faceNormals.push_back(normals[nIndices[idx3]]);
+                        }
+                        else
+                        {
+                                // no face normals?
+                                const SimpleTri tri(vertices[indices[idx1]], vertices[indices[idx2]], vertices[indices[idx3]]);
+                                const SimpleVec n = tri.GetNormal();
+
+                                faceNormals.push_back(n);
+                                faceNormals.push_back(n);
+                                faceNormals.push_back(n);
+                        }
+
+                        if (!texcoords.empty())
+                        {
+                                faceTexcoords.push_back(texcoords[tIndices[idx1]]);
+                                faceTexcoords.push_back(texcoords[tIndices[idx2]]);
+                                faceTexcoords.push_back(texcoords[tIndices[idx3]]);
+                        }
                 }
         }
@@ -121 +138 @@
 
         // convert the triangles to geometry
-        geom->mVertices = new Vector3[numElements];
-        geom->mNormals = new Vector3[numElements];
+        geom->mVertices = new SimpleVec[numElements];
+        geom->mNormals = new SimpleVec[numElements];
         geom->mTexcoords = new Texcoord[numElements];
 
@@ -132 +149 @@
         for (int i = 0; i < numElements; ++ i)
         {
+#if 0
                 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->mNormals[i].y = -faceNormals[i].z;
                 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;
+
+#endif
                 if (i < geom->mTexcoordCount)
                 {
@@ -220 +247 @@
                                 case 'n' :
                                         sscanf(str + 2, "%f %f %f", &x, &y, &z);
-                                        normals.push_back(Vector3(x, y, z));
+                                        normals.push_back(SimpleVec(x, y, z));
                                         break;
                                 case 't':
@@ -228 +255 @@
                                 default:
                                         sscanf(str + 1, "%f %f %f", &x, &y, &z);
-                                        vertices.push_back(Vector3(x, y, z));
+                                        vertices.push_back(SimpleVec(x, y, z));
                                         //cout <<"v " << x << " " << y << " "<< z << " ";
                                 }
@@ -242 +269 @@
                                                 faceVertices, faceNormals, faceTexcoords);
 
-                                if (((line % 1000) == 999) && 
-                                        !faceVertices.empty())
+                                if (0 &&
+                                        (((line % 1000) == 999) && !faceVertices.empty()))
                                 {
                                         ++ mNumShapes;
@@ -299 +326 @@
         str.write(reinterpret_cast<char *>(&vertexCount), sizeof(int));
   
-        str.write(reinterpret_cast<char *>(geom->mVertices), sizeof(Vector3) * vertexCount);
-        str.write(reinterpret_cast<char *>(geom->mNormals), sizeof(Vector3) * vertexCount);
+        str.write(reinterpret_cast<char *>(geom->mVertices), sizeof(SimpleVec) * vertexCount);
+        str.write(reinterpret_cast<char *>(geom->mNormals), sizeof(SimpleVec) * vertexCount);
 
         int texCoordCount = geom->mTexcoordCount;
@@ -330 +357 @@
         if (hasMaterial)
         {
-                Vector3 ambient, diffuse, black;
+                SimpleVec ambient, diffuse, black;
 
                 ambient.x = ambient.y = ambient.z = 0.2f;
@@ -337 +364 @@
 
                 // only write rgb part of the material
-                str.write(reinterpret_cast<char *>(&ambient), sizeof(Vector3));
-                str.write(reinterpret_cast<char *>(&diffuse), sizeof(Vector3));
-                str.write(reinterpret_cast<char *>(&black), sizeof(Vector3));
-                str.write(reinterpret_cast<char *>(&black), sizeof(Vector3));
+                str.write(reinterpret_cast<char *>(&ambient), sizeof(SimpleVec));
+                str.write(reinterpret_cast<char *>(&diffuse), sizeof(SimpleVec));
+                str.write(reinterpret_cast<char *>(&black), sizeof(SimpleVec));
+                str.write(reinterpret_cast<char *>(&black), sizeof(SimpleVec));
         }
 }

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

@@ -2 +2 @@
 #define _OBJCONVERTER_H
 
+#include "SimpleVec.h"
 #include <string>
 #include <vector>
 
-struct Vector3
+/*struct SimpleVec
 {
-        Vector3() {}
-        Vector3(float _x, float _y, float _z): x(_x), y(_y), z(_z) {}
+        SimpleVec() {}
+        SimpleVec(float _x, float _y, float _z): x(_x), y(_y), z(_z) {}
 
         float x, y, z;
-};
+};*/
 
-typedef std::vector<Vector3> VertexArray;
+typedef std::vector<SimpleVec> VertexArray;
 typedef std::pair<float, float> Texcoord;
 
@@ -36 +37 @@
         struct Geometry
         {
-                Vector3 *mVertices;
-                Vector3 *mNormals;
+                SimpleVec *mVertices;
+                SimpleVec *mNormals;
                 Texcoord *mTexcoords;
 

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

@@ -15 +15 @@
         cout << "converting obj to dem format" << endl;
 
-/*      if (!converter.Convert(model_path + argv[1], model_path + argv[2]))
+        if (!converter.Convert(model_path + argv[1], model_path + argv[2]))
         {
                 cerr << "conversion failed" << endl;
                 exit(0);
         }
-*/
-        //if (!converter.Convert(model_path + "toyplane.obj", model_path + "toyplane.dem"))
-        //      cerr << "conversion failed" << endl;
-
-        //if (!converter.Convert(model_path + "sky.obj", model_path + "sky.dem"))
-        //      cerr << "conversion failed" << endl;
-
-        if (!converter.Convert(model_path + "city_full.obj", model_path + "city_full.dem"))
-                cerr << "conversion failed" << endl;
 
         cout << "conversion successful" << endl;

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.sln

@@ -6 +6 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Converter", "Converter.vcproj", "{93A522E1-76F0-4D46-9C97-30DC2DDB531D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FriendlyCulling", "MainApp.vcproj", "{A564071F-D054-4556-883B-999D7F9CC58C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MainApp", "MainApp.vcproj", "{A564071F-D054-4556-883B-999D7F9CC58C}"
         ProjectSection(ProjectDependencies) = postProject
                 {03661866-4093-4B02-B26A-028EA91AF023} = {03661866-4093-4B02-B26A-028EA91AF023}
         EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IrradianceMapping", "IrradianceMapping.vcproj", "{91680C49-A358-48AE-A02C-66CB884B7D7F}"
 EndProject
 Global
@@ -29 +31 @@
                 {A564071F-D054-4556-883B-999D7F9CC58C}.Release|Win32.ActiveCfg = Release|Win32
                 {A564071F-D054-4556-883B-999D7F9CC58C}.Release|Win32.Build.0 = Release|Win32
+                {91680C49-A358-48AE-A02C-66CB884B7D7F}.Debug|Win32.ActiveCfg = Debug|Win32
+                {91680C49-A358-48AE-A02C-66CB884B7D7F}.Debug|Win32.Build.0 = Debug|Win32
+                {91680C49-A358-48AE-A02C-66CB884B7D7F}.Release|Win32.ActiveCfg = Release|Win32
+                {91680C49-A358-48AE-A02C-66CB884B7D7F}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

GTP/trunk/App/Demos/Vis/FriendlyCulling/MainApp.vcproj

@@ -3 +3 @@
         ProjectType="Visual C++"
         Version="8,00"
-        Name="FriendlyCulling"
+        Name="MainApp"
         ProjectGUID="{A564071F-D054-4556-883B-999D7F9CC58C}"
         RootNamespace="MainApp"
@@ -143 +143 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="DemoEngine.lib glut32.lib glew32s.lib glew32.lib DevIL.lib ILUT.lib zlib.lib cg.lib cgGL.lib"
+                                OutputFile="$(OutDir)\FriendlyCulling.exe"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories=""lib/$(ConfigurationName)";libs;"$(CG_LIB_PATH)";libs/GL;libs/Devil/lib;libs/Zlib/lib"

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

@@ -59 +59 @@
 /// the renderable scene geometry
 SceneEntityContainer sceneEntities;
+SceneEntityContainer sceneEntities2;
+
 // traverses and renders the hierarchy
 RenderTraverser *traverser = NULL;
@@ -440 +442 @@
         loader = new ResourceManager();
 
-        //const string filename("data/city/model/city.dem");
         const string filename = string(model_path + "city.dem");
 
         if (loader->Load(filename, sceneEntities))
-                cout << "scene " << filename << " loaded" << endl;
+                cout << "model " << filename << " loaded" << endl;
         else
         {
-                cerr << "loading scene " << filename << " failed" << endl;
+                cerr << "loading model " << filename << " failed" << endl;
                 CleanUp();
                 exit(0);
@@ -463 +464 @@
         }
         
-#if 0
-
-        int merged = 0;
-
-        SceneEntity *oldEnt = NULL;
-
-        cout << "merging entities .. " << endl;
-        SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
-
-        for (sit = sceneEntities.begin(); sit < sit_end; ++ sit)
-        {
-                SceneEntity *newEnt = (*sit);
-
-                if (!newEnt->GetTransform()->IsIdentity())
-                {
-                        sceneEntities2.push_back(newEnt);
-                        continue;
-                }
-
-                if (oldEnt)
-                {
-                        EntityMerger merger(newEnt, oldEnt);
-                        SceneEntity *ent = merger.Merge();
-
-                        sceneEntities2.push_back(ent);
-
-                        oldEnt = NULL;
-
-                        ++ merged;
-                }
-                else
-                {
-                        oldEnt = newEnt;
-                }
-        }
-
-        if (oldEnt && oldEnt->GetTransform()->IsIdentity())
-                sceneEntities2.push_back(oldEnt);
-
-        cout << "merged " << merged << " of " << (int)sceneEntities.size() << " entities " << endl;
-#endif
 
         // set far plane based on scene extent
@@ -1171 +1131 @@
                 // actually render the scene geometry using the specified algorithm
                 traverser->RenderScene();
-                //renderQueue->Apply();
         }