Changeset 3107

Timestamp:

11/06/08 17:48:52 (16 years ago)

Author:

mattausch

Message:

added converter for vbo format from ralf

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter.vcproj (modified) (1 diff)
• FriendlyCulling.sln (modified) (2 diffs)
• VboFormatConverter (added)
• VboFormatConverter.vcproj (added)
• VboFormatConverter/SimpleTri.cpp (added)
• VboFormatConverter/SimpleTri.h (added)
• VboFormatConverter/SimpleVec.cpp (added)
• VboFormatConverter/SimpleVec.h (added)
• VboFormatConverter/VboFormatConverter.cpp (added)
• VboFormatConverter/VboFormatConverter.h (added)
• VboFormatConverter/gzstream.cpp (added)
• VboFormatConverter/gzstream.h (added)
• VboFormatConverter/main.cpp (added)
• src/DeferredRenderer.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (1 diff)
• src/shaderenv.h (modified) (2 diffs)
• src/shaders/ssao.cg (modified) (3 diffs)

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

@@ -98 +98 @@
                 <Configuration
                         Name="Release|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="$(SolutionDir)\Converter\$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\Converter"
                         ConfigurationType="1"
                         CharacterSet="1"

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

@@ -10 +10 @@
                 {03661866-4093-4B02-B26A-028EA91AF023} = {03661866-4093-4B02-B26A-028EA91AF023}
         EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VboFormatConverter", "VboFormatConverter.vcproj", "{93A522E1-76F0-4D46-9C97-30DC2DDB531B}"
 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
+                {93A522E1-76F0-4D46-9C97-30DC2DDB531B}.Debug|Win32.ActiveCfg = Debug|Win32
+                {93A522E1-76F0-4D46-9C97-30DC2DDB531B}.Debug|Win32.Build.0 = Debug|Win32
+                {93A522E1-76F0-4D46-9C97-30DC2DDB531B}.Release|Win32.ActiveCfg = Release|Win32
+                {93A522E1-76F0-4D46-9C97-30DC2DDB531B}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

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

@@ -261 +261 @@
         const int dsh = h / 2;
 
+        //const int dsw = w;
+        //const int dsh = h;
+
         mIllumFbo = new FrameBufferObject(dsw, dsh, FrameBufferObject::DEPTH_NONE);
         //mIllumFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);

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

@@ -50 +50 @@
 #include "Light.h"
 #include "SceneEntityConverter.h"
-#include "ObjConverter.h"
 #include "SkyPreetham.h"
 #include "Texture.h"

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaderenv.h

@@ -26 +26 @@
 
 
+////////
+//-- reprojection
+
+#define MIN_DEPTH_DIFF 1e-2f
+#define PRECISION_SCALE 1e-1f
+
+
 /////////
 //-- shadowing
@@ -42 +49 @@
 
 #define MAX_LOD_LEVEL 10
-
-//#define MIN_DEPTH_DIFF 5e-3f
-#define MIN_DEPTH_DIFF 1e-2f
-//#define MIN_DEPTH_DIFF 1e-3f
-#define PRECISION_SCALE 1e-1f
-
-// burnout
+// burnout (really bright regions will be saturated to white)
 #define WHITE_LUMINANCE 3e4f
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/ssao.cg

@@ -362 +362 @@
         
         float4 projPos = mul(modelViewProj, eyeSpacePos);
-        const float w = 1 / projPos.w;
+        const float w = 1.0f / projPos.w;
         projPos *= w;
         float scaleFactor = SAMPLE_RADIUS * w;
         
-        const float2 ao = ssao(IN, colors, noiseTex, samples, normal, 
-                                   eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir));
+        float2 ao = float2(1.0f, 0);
+        // note: this should be done with the stencil buffer
+        if (eyeSpaceDepth < 1e10f)
+                ao = ssao(IN, colors, noiseTex, samples, normal, 
+                          eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir));
 
 
@@ -381 +384 @@
         return OUT;
 }
+
 
 float Filter(float2 texCoord, 
@@ -415 +419 @@
         float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        //if ((ao.y < 10.0f) && (col.w < 1e10f))
-        //      ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights, 1.0f / (1.0f + ao.y));//ao.z);
+        if ((ao.y < 10.0f) && (col.w < 1e10f))
+                ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights, 1.0f / (1.0f + ao.y));//ao.z);
 
         OUT.illum_col = col * ao.x;