Changeset 2832 for GTP/trunk/App

Timestamp:

07/10/08 23:10:18 (16 years ago)

Author:

mattausch

Message:

debug version: noise multipler does not work so well (but would with temporal smoothing)

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• chcdemo.cpp (modified) (4 diffs)
• shaders/deferred.cg (modified) (4 diffs)

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

@@ -256 +256 @@
 //static CGparameter sSamplesParam; 
 static CGparameter sSamplesParamSsao; 
+static CGparameter sNoiseMultiplierParam;; 
 
 
@@ -537 +538 @@
                 sNormalsTexParamSsao = cgGetNamedParameter(sCgSsaoProgram, "normals");  
                 sNoiseTexParamSsao = cgGetNamedParameter(sCgSsaoProgram, "noiseTexture");
+                sNoiseMultiplierParam = cgGetNamedParameter(sCgSsaoProgram, "noiseMultiplier");
+                
                 cgGLDisableTextureParameter(sNoiseTexParamSsao);
 
@@ -1917 +1920 @@
                 cgGLEnableTextureParameter(sNoiseTexParamSsao);
                 cgGLSetTextureParameter(sNoiseTexParamSsao, noiseTex);
+
+                cgGLSetParameter1f(sNoiseMultiplierParam, RandomValue(3.0f, 7.0f));
         }
         else
@@ -2047 +2052 @@
         // generates poisson distribution on disc
         float factor = 1.0f;
-        float minDist = factor * sqrt((float)NUM_SAMPLES) / 2;
+        float minDist = factor / (sqrt((float)NUM_SAMPLES) * 2.0f);
 
         cout << "minDist= " << minDist << endl;

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

@@ -50 +50 @@
            uniform sampler2D noiseTexture,
            uniform float2 samples[NUM_SAMPLES],
-           uniform float3 currentNormal
-           )
+           uniform float3 currentNormal,
+           uniform float noiseMultiplier)
 {
   // the current world position
@@ -72 +72 @@
     
     //sample noisetex; r stores costheta, g stores sintheta
-    float2 noise = tex2D(noiseTexture, IN.texCoord.xy * 7.0f).xy * 2.0f - 1.0f;
+    float2 noise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
         
     // rotation
@@ -144 +144 @@
                uniform sampler2D normals,
                uniform sampler2D noiseTexture,
-               uniform float2 samples[NUM_SAMPLES])
+               uniform float2 samples[NUM_SAMPLES],
+               uniform float noiseMultiplier)
 {
   pixel OUT;
@@ -155 +156 @@
 
   float4 col = shade(IN, colors, positions, normal, amb);
-  float ao = ssao(IN, positions, noiseTexture, samples, normal);
+  float ao = ssao(IN, positions, noiseTexture, samples, normal, noiseMultiplier);
   
    //OUT.color = ao;