Changeset 3341 for GTP/trunk/App/Demos

Timestamp:

04/12/09 23:24:55 (16 years ago)

Author:

mattausch

Message:

nix geht

Location:

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

Files:

• DeferredRenderer.cpp (modified) (4 diffs)
• chcdemo.cpp (modified) (1 diff)
• shaders/combineSsaoSep.cg (modified) (2 diffs)
• shaders/deferred.cg (modified) (2 diffs)
• shaders/ssao.cg (modified) (5 diffs)

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

@@ -811 +811 @@
         attribsTex = fbo->GetColorBuffer(2)->GetTexture();
 
+
         /////////
         //-- flip flop between illumination buffers
@@ -845 +846 @@
                 {
                         CreateSampleTex(samples2, NUM_PRECOMPUTED_SAMPLES);
+                        cout<<"here34"<<endl;
                 }
                 else
@@ -1419 +1421 @@
         const float distanceToLight = Magnitude(vectorToLight);
         vectorToLight /= distanceToLight;
-
         //cout << "dist " << distanceToLight << " v " << vectorToLight << endl;
 
@@ -1511 +1512 @@
 
         delete [] data;
-
         stopil();
 

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

@@ -657 +657 @@
         Matrix4x4 transl = TranslationMatrix(positions[0]);
         
-        //LoadModel("hbuddha.dem", dynamicObjects);
-        LoadModel("torus.dem", dynamicObjects);
+        LoadModel("hbuddha.dem", dynamicObjects);
+        //LoadModel("torus.dem", dynamicObjects);
         //LoadModel("venusm.dem", dynamicObjects);
 

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

@@ -194 +194 @@
         }
 
+
         return OUT;
 }
@@ -248 +249 @@
         }
 
-        //OUT.illum_col.xyz = float3(ao.w * 5e-3f, 0, 0);
-        //OUT.illum_col.xyz = float3(ao.y * 1e-2f, 0, 0);
+        OUT.illum_col.xyz = float3(ao.w * 5e-1f, 0, 0);
+        //OUT.illum_col.xyz = float3(ao.z * 1e-1f);
+        OUT.illum_col.xyz = float3(ao.y * 1e-1f);//, 0, 0);
         //OUT.illum_col.xyz = ao.xyz;
 

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

@@ -331 +331 @@
 
         float4 color = tex2Dlod(colorsTex, float4(IN.texCoord, .0f, .0f));
-        // store scaled view vector so wie don't have to normalize for e.g., ssao
+        // store scaled view vector so wie don't have to normalize for e.g., SSAO
         color.w /= length(IN.view);
 
@@ -353 +353 @@
                                                                          );
 #else
-
         const float2 pValid = float2(0,0);
-
 #endif
 

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

@@ -128 +128 @@
         float w;
         float idx;
+
 
         //////////////
@@ -433 +434 @@
 
 #endif // PERFORMANCE_TEST
-
         }
 
@@ -487 +487 @@
         const float4 eyeSpacePos = float4(-viewDir * eyeSpaceDepth, 1.0f);
 
+
         ////////////////
         //-- calculcate the current projected posiion (also used for next frame)
@@ -522 +523 @@
         
         float oldWeight = temporalVals.y;
-        float oldIdx = temporalCoherence > 1 ? temporalVals.z : 0;
+        float oldIdx = /*temporalCoherence > 1 ? */temporalVals.z/* : 0*/;
         
 #else
@@ -599 +600 @@
 
         OUT.illum_col.y = combinedWeight;
-        OUT.illum_col.z = oldIdx + newWeight; // the new index
+        OUT.illum_col.z = oldIdx + 8;//newWeight; // the new index
         OUT.illum_col.w = eyeSpaceDepth;