Changeset 2784 for GTP

Timestamp:

06/20/08 00:46:27 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/CHC_revisited

Files:

• DevIL.dll (added)
• chc_revisited.vcproj (modified) (5 diffs)
• src/BinaryLoader.cpp (modified) (1 diff)
• src/RenderTraverser.cpp (modified) (1 diff)
• src/Timers.h (deleted)
• src/chcdemo.cpp (modified) (1 diff)
• src/common.cpp (modified) (2 diffs)
• src/common.h (modified) (1 diff)

GTP/trunk/App/Demos/Vis/CHC_revisited/chc_revisited.vcproj

@@ -18 +18 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="$(SolutionDir)/bin/$(ConfigurationName)"
+                        IntermediateDirectory="obj/$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="1"
@@ -41 +41 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="Devil/include;GL"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+                                AdditionalIncludeDirectories="libs;libs/GL;libs/Devil/include;src"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
                                 MinimalRebuild="true"
                                 BasicRuntimeChecks="3"
@@ -65 +65 @@
                                 AdditionalDependencies="glut32.lib glew32s.lib glew32.lib DevIL.lib ILUT.lib"
                                 LinkIncremental="2"
-                                AdditionalLibraryDirectories="GL;Devil/lib"
+                                AdditionalLibraryDirectories="libs/GL;libs/Devil/lib"
                                 GenerateDebugInformation="true"
                                 SubSystem="1"
@@ -97 +97 @@
                 <Configuration
                         Name="Release|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="$(SolutionDir)/bin/$(ConfigurationName)"
+                        IntermediateDirectory="obj/$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="1"
@@ -127 +127 @@
                                 EnableFiberSafeOptimizations="true"
                                 AdditionalIncludeDirectories="libs;libs/GL;libs/Devil/include;src"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE; _CRT_SECURE_NO_WARNINGS"
                                 StringPooling="true"
                                 RuntimeLibrary="2"

GTP/trunk/App/Demos/Vis/CHC_revisited/src/BinaryLoader.cpp

@@ -97 +97 @@
 
                 //cout << "loading texture " << texname << " with len " << texnameSize << " id: " << id << endl;
-                Texture *tex = new Texture(texname);
+                Texture *tex = new Texture(model_path + texname);
 
                 mTextureTable[i] = tex;

GTP/trunk/App/Demos/Vis/CHC_revisited/src/RenderTraverser.cpp

@@ -1 +1 @@
 #include "RenderTraverser.h"
 #include "glInterface.h"
-#include "Timers.h"
 #include "Camera.h"
 #include "SceneEntity.h"

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

@@ -157 +157 @@
         BinaryLoader loader;
 
-        //const string filename("house_test.dem");
-        //const string filename("city_demo.dem");
-        const string filename("city.dem");
-        //const string filename("roofs.dem");
+        //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;
         else
+        {
                 cerr << "loading scene " << filename << " failed" << endl;
-
+                exit(0);
+        }
+
+        const string bvh_filename = string(model_path + "city.bvh");
         BvhLoader bvhLoader;
-        //bvh = bvhLoader.Load("roofs.bvh", sceneEntities);
-        bvh = bvhLoader.Load("city.bvh", sceneEntities);
-        //bvh = bvhLoader.Load("city_demo.bvh", sceneEntities);
-        //bvh = bvhLoader.Load("house_test.bvh", sceneEntities);
+        bvh = bvhLoader.Load(bvh_filename, sceneEntities);
+        //bvh = bvhLoader.Load("data/city/model/city.bvh", sceneEntities);
+
+        if (!bvh)
+        {
+                cerr << "loading bvh " << bvh_filename << " failed" << endl;
+                exit(0);
+        }
 
         bvh->SetCamera(camera);
         ResetTraverser();
-
-        //camera->LookAtBox(sceneBox);
-        //camera->LookInBox(bvh->GetBox());
 
         camera->SetDirection(Vector3(0.961829f, 0.273652f, 0.0f));

GTP/trunk/App/Demos/Vis/CHC_revisited/src/common.cpp

@@ -139 +139 @@
                 _ftime(&mtime);
 
-                return 1000*(1000*mtime.time + mtime.millitm);
+                return 1000*(1000*(long)mtime.time + (long)mtime.millitm);
         }
 #endif
@@ -162 +162 @@
                 static struct _timeb mtime;
                 _ftime(&mtime);
-                return 1000*(1000*mtime.time + mtime.millitm);
+                return 1000*(1000*(long)mtime.time + (long)mtime.millitm);
         }
 #endif

GTP/trunk/App/Demos/Vis/CHC_revisited/src/common.h

@@ -462 +462 @@
 
 
+//////
+//-- model directory
+
+static std::string model_path("data/city/model/");
+
 ///////////
 //-- typedefs