Changeset 3292 for GTP

Timestamp:

01/27/09 16:29:45 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter.vcproj (modified) (2 diffs)
• MainApp.vcproj (modified) (3 diffs)
• VboFormatConverter.vcproj (modified) (2 diffs)
• VisibilitySolutionConverter.vcproj (modified) (2 diffs)
• data/city/trees (added)
• data/city/trees/aspen_normal_grp.iv (added)
• data/city/trees/aspen_normal_ig.iv (added)
• data/city/trees/aspen_normal_ig_0.rgb (added)
• data/city/trees/aspen_normal_ig_1.rgb (added)
• data/city/trees/aspen_normal_ig_2.rgb (added)
• data/city/trees/aspen_normal_ig_3.rgb (added)
• data/city/trees/aspen_normal_is.iv (added)
• data/city/trees/aspen_normal_is_0.rgb (added)
• data/city/trees/aspen_normal_is_1.rgb (added)
• data/city/trees/aspen_normal_is_2.rgb (added)
• data/city/trees/aspen_normal_is_3.rgb (added)
• data/city/trees/aspen_normal_lp.iv (added)
• data/city/trees/aspen_normal_nl.iv (added)
• data/city/trees/aspen_normal_np.iv (added)
• data/city/trees/textures (added)
• data/city/trees/textures/bark8.bmp (added)
• data/city/trees/textures/bark9.BMP (added)
• data/city/trees/textures/leaf2_a.rgb (added)
• data/city/trees/textures/leaf2_at.rgb (added)
• data/city/trees/textures/leaf2_b.rgb (added)
• data/city/trees/textures/leaf2_bt.rgb (added)
• data/city/trees/textures/leaf2_c.rgb (added)
• data/city/trees/textures/leaf2_ct.rgb (added)
• data/city/trees/textures/leaf2_pt.rgb (added)
• data/city/trees/textures/leaf2_qt.rgb (added)
• data/city/trees/textures/leaf2c.rgb (added)
• data/city/trees/textures/leaf3_a.rgb (added)
• data/city/trees/textures/leaf3_at.rgb (added)
• data/city/trees/textures/leaf4_a.rgb (added)
• data/city/trees/textures/leaf4_at.rgb (added)
• data/city/trees/textures/leaf5_a.rgb (added)
• data/city/trees/textures/leaf5_at.rgb (added)
• data/city/trees/textures/leaf6_a.rgb (added)
• data/city/trees/textures/leaf6_at.rgb (added)
• data/city/trees/textures/leaf7_at.rgb (added)
• data/city/trees/textures/leaf8_at.rgb (added)
• data/city/trees/textures/leaf8_bt.rgb (added)
• data/city/trees/textures/leaf8_ct.rgb (added)
• data/city/trees/textures/leaf9_at.rgb (added)
• data/city/trees/textures/leaf9_bt.rgb (added)
• data/city/trees/textures/leaf9_ct.rgb (added)
• default.env (modified) (2 diffs)
• src/chcdemo.cpp (modified) (4 diffs)

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

@@ -18 +18 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="$(SolutionDir)\$(ProjectName)\$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        OutputDirectory="$(SolutionDir)\$(ProjectName)\bin\$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)\$(ProjectName)\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="1"
@@ -99 +99 @@
                 <Configuration
                         Name="Release|Win32"
-                        OutputDirectory="$(SolutionDir)\$(ProjectName)\$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        OutputDirectory="$(SolutionDir)\$(ProjectName)\bin\$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)\$(ProjectName)\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="1"

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

@@ -18 +18 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="$(SolutionDir)\$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)\obj"
                         ConfigurationType="1"
                         CharacterSet="1"
@@ -99 +99 @@
                 <Configuration
                         Name="Release|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="$(SolutionDir)\bin\$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="1"
@@ -124 +124 @@
                                 Optimization="3"
                                 InlineFunctionExpansion="2"
+                                EnableIntrinsicFunctions="true"
                                 FavorSizeOrSpeed="1"
                                 OmitFramePointers="true"

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

@@ -18 +18 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="$(SolutionDir)$\VboFormatConverter\(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        OutputDirectory="$(SolutionDir)\$(ProjectName)\bin\$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)\$(ProjectName)\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="1"
@@ -98 +98 @@
                 <Configuration
                         Name="Release|Win32"
-                        OutputDirectory="$(SolutionDir)\$(ProjectName)\$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        OutputDirectory="$(SolutionDir)\$(ProjectName)\bin\$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)\$(ProjectName)\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="1"

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

@@ -18 +18 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="$(SolutionDir)\$(ProjectName)\bin\$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)\$(ProjectName)\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="1"
@@ -98 +98 @@
                 <Configuration
                         Name="Release|Win32"
-                        OutputDirectory="$(SolutionDir)\$(ProjectName)\$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        OutputDirectory="$(SolutionDir)\$(ProjectName)\bin\$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)\$(ProjectName)\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="1"

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -13 +13 @@
 #filename=mypompeii
 #bvhname=mypompeii
-filename=pompeii/pompeii_full
+#filename=pompeii/pompeii_full
 #filename=pompeii/pompeii_part
-#filename=city
-#bvhname=city
+filename=city
+bvhname=city
 useLODs=1
 # shadow map size
@@ -75 +75 @@
 
 # initial camera position
-#camPosition=483.398f 242.364f 186.078f
+camPosition=483.398f 242.364f 186.078f
 # pompeii view point
-camPosition=1300.0f -2500.0f 10.0f
+#camPosition=1300.0f -2500.0f 10.0f
 # pompeii problematic
 #camPosition=627.003 -1725.33 25.2

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

@@ -388 +388 @@
 void LoadOrUpdatePVSs(const Vector3 &pos);
 
-
+string envFileName = "default.env";
 
 float pvsTotalSamples = .0f;
@@ -435 +435 @@
         Vector3 lightDir(-0.8f, 1.0f, -0.7f);
 
-        cout << "=== reading environment file ===" << endl << endl;
-
-        const string envFileName = "default.env";
+        if (argc > 1) envFileName = argv[1];
+
+        cout << "=== reading environment file " << envFileName << " ===" << endl << endl;
+
         if (!env.Read(envFileName))
         {
@@ -2392 +2393 @@
                         {                       
                                 sprintf(msg[7], "%s:  %6.1f fps", alg_str[renderMode], fps);            
-                                myfont.DrawString(msg[7], 1.3f, winWidth - 300, winHeight - 10.0f);
+                                myfont.DrawString(msg[7], 1.3f, winWidth - 330, winHeight - 10.0f);
 
                                 //int mrays = (int)shotRays / 1000000;
                                 //sprintf(msg[7], "%s:  %04d M rays", alg_str[renderMode], mrays);      
-                                //myfont.DrawString(msg[7], 1.3f, winWidth - 300, winHeight - 60.0f);           
+                                //myfont.DrawString(msg[7], 1.3f, winWidth - 330, winHeight - 60.0f);           
                         }
                 }
@@ -2402 +2403 @@
                 {
                         sprintf(msg[7], "%s:  %6.1f ms", alg_str[renderMode], rTime);
-                        myfont.DrawString(msg[7], 1.3f, winWidth - 300, winHeight - 10.0f);
+                        myfont.DrawString(msg[7], 1.3f, winWidth - 330, winHeight - 10.0f);
                 }