Changeset 497 for trunk/VUT/GtpVisibilityPreprocessor/scripts

Timestamp:

01/04/06 18:39:24 (19 years ago)

Author:

mattausch

Message:

beware: bug in view cells merging

Location:

trunk/VUT/GtpVisibilityPreprocessor/scripts

Files:

• Preprocessor.vcproj (modified) (6 diffs)
• default.env (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj

@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;..\include"
+                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;..\include;"$(QTDIR)""
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                 MinimalRebuild="TRUE"
@@ -62 +62 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;..\include"
+                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;..\include;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;include"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
                                 RuntimeLibrary="2"
@@ -76 +76 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="xerces-c_2.lib zdll.lib zziplib.lib devil.lib"
-                                AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;..\support\devil\lib;&quot;$(QTDIR)\lib&quot;"/>
+                                AdditionalDependencies="xerces-c_2.lib zdll.lib zziplib.lib devil.lib qtmain.lib QtOpenGL4.lib QtUiTools.lib QtCore4.lib QtDesigner4.lib QtGui4.lib QtAssistantClient.lib QtTest4.lib Qt3Supportd4.lib QAxContainer.lib QAxServerd.lib QtXml4.lib glut32.lib OpenGL32.Lib glu32.lib QAxServer.lib QtDesignerComponents4.lib"
+                                AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;..\support\devil\lib;&quot;$(QTDIR)\lib&quot;;..\include\GL"/>
                         <Tool
                                 Name="VCMIDLTool"/>
@@ -147 +147 @@
                         </File>
                         <File
+                                RelativePath="..\src\GlRenderer.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\GlRenderer.h">
+                                <FileConfiguration
+                                        Name="Release|Win32">
+                                        <Tool
+                                                Name="VCCustomBuildTool"
+                                                Description="Performing moc on $(InputName).h"
+                                                CommandLine="%qtdir%\bin\moc.exe $(InputDir)$(InputName).h -o $(InputDir)moc_$(InputName).cpp"
+                                                Outputs="$(InputDir)moc_$(InputName).cpp"/>
+                                </FileConfiguration>
+                        </File>
+                        <File
                                 RelativePath="..\src\gzstream.cpp">
                         </File>
@@ -195 +209 @@
                         </File>
                         <File
+                                RelativePath="..\src\moc_GlRenderer.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\moc_Preprocessor.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\moc_PreprocessorThread.cpp">
+                        </File>
+                        <File
                                 RelativePath="..\src\MutualVisibility.cpp">
                         </File>
@@ -223 +246 @@
                         <File
                                 RelativePath="..\src\Preprocessor.h">
+                                <FileConfiguration
+                                        Name="Release|Win32">
+                                        <Tool
+                                                Name="VCCustomBuildTool"
+                                                Description="Performing moc on $(InputName).h"
+                                                CommandLine="%qtdir%\bin\moc.exe $(InputDir)$(InputName).h -o $(InputDir)moc_$(InputName).cpp"
+                                                Outputs="$(InputDir)moc_$(InputName).cpp"/>
+                                </FileConfiguration>
+                        </File>
+                        <File
+                                RelativePath="..\src\PreprocessorThread.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\PreprocessorThread.h">
+                                <FileConfiguration
+                                        Name="Release|Win32">
+                                        <Tool
+                                                Name="VCCustomBuildTool"
+                                                Description="Performing moc on $(InputName).h"
+                                                CommandLine="%qtdir%\bin\moc.exe $(InputDir)$(InputName).h -o $(InputDir)moc_$(InputName).cpp"
+                                                Outputs="$(InputDir)moc_$(InputName).cpp"/>
+                                </FileConfiguration>
                         </File>
                         <File

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -21 +21 @@
         # stored sample rays
         samplesFilename rays.out
+        useGlRenderer false
 #       type sampling
         type vss
@@ -68 +69 @@
 RssPreprocessor {
         samplesPerPass  100000
-        initialSamples 400000
-        vssSamples 1000000
-        vssSamplesPerPass 100000
+        initialSamples 500000
+        vssSamples 10000000
+        vssSamplesPerPass 500000
         useImportanceSampling true
-        loadInitialSamples true
+
+        directionalSampling true
+        objectBasedSampling false
+
+        Export {
+                pvs false
+                rssTree false
+                rays true
+                numRays 5000
+        }
+
+        useViewcells true
+        updateSubdivision true
+loadInitialSamples true
         storeInitialSamples false
 }
 
+
 RssTree {
-        #useRss    false
+
         epsilon         1e-6
 
         maxDepth        40
-        minPvs          5
+        minPvs          3
         minRays         30
         minSize         0.001
-        maxCostRatio    0.9
-        maxRayContribution 0.1
-        
+        maxCostRatio 1.0
+        maxRayContribution 0.5
+        maxRays         1000000
         maxTotalMemory  200
         maxStaticMemory 100
@@ -93 +108 @@
 #       splitType heuristic
         splitType hybrid
-        splitUseOnlyDrivingAxis false
+        splitUseOnlyDrivingAxis true
+        importanceBasedCost false
 
         interleaveDirSplits     true
-    dirSplitDepth 9
+    dirSplitDepth 0
 
         numberOfEndPointDomains 10000
@@ -152 +168 @@
         loadFromFile false
         #type kdTree
-        type vspKdTree
+        #type vspKdTree
         #type bspTree
         type vspBspTree
@@ -179 +195 @@
                 colorCode Random
                 exportRays false
-                exportGeometry true
+                exportGeometry false
         }
         
@@ -294 +310 @@
                 minViewCells 500
                 maxPvsSize   1000
-                useRaysForMerge true
+                useRaysForMerge false
         }
 }