Changeset 3109

Timestamp:

11/07/08 10:15:44 (16 years ago)

Author:

mattausch

Message:

working on incorporation of dynamic objects into ssao

Location:

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

Files:

• SceneEntity.cpp (modified) (1 diff)
• SceneEntity.h (modified) (1 diff)
• shaders/combineSsao.cg (added)
• shaders/ssao.cg (modified) (4 diffs)

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

@@ -15 +15 @@
 {
 
+int SceneEntity::sCurrentId = 0;
 bool SceneEntity::sUseLODs = true;
 
 
 SceneEntity::SceneEntity(Transform3 *trafo): 
-mTransform(trafo), mCurrentLODLevel(0), mLODLastUpdated(-1)
+mTransform(trafo), mCurrentLODLevel(0), mLODLastUpdated(-1), mId(sCurrentId ++)
 {
         mBox.Initialize();

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

@@ -127 +127 @@
         Vector3 mCenter;
 
+        int mId;
+
         static bool sUseLODs;
+        static int sCurrentId;
 };
+
 
 }

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

@@ -125 +125 @@
                                                                 uniform float4x4 oldModelViewProj,
                                                                 uniform float temporalCoherence,
-                                                                uniform float2 samples[NUM_SAMPLES],
                                                                 uniform sampler2D colors,
-                                                                uniform sampler2D noiseTex,
-                                                                float scaleFactor,
                                                                 uniform float3 bl,
                                                                 uniform float3 br,
                                                                 uniform float3 tl,
                                                                 uniform float3 tr, 
+                                                                float invW,
+                                                                float3 projPos,
+                                                                float4x4 inverseModelTrafo,
+                                                                float id,
+                                                                uniform sampler2D noiseTex,
+                                                                uniform float2 samples[NUM_SAMPLES],
+                                                                float scaleFactor,
                                                                 uniform float3 oldbl,
                                                                 uniform float3 oldbr,
                                                                 uniform float3 oldtl,
-                                                                uniform  float3 oldtr,
-                                                                float invW,
-                                                                float3 projPos
-                                                                //,const uniform float4x4 inverseModelTrafo
-                                                                //, float id
-                                                 )
+                                                                uniform  float3 oldtr
+                                                                )
 {
         float4 illum_col;
 
+        ////////////
+        //-- dynamic objects
+        
+        float4x4 trafo;
+        
+        if (id > 20) trafo = oldModelViewProj;
+        else trafo = inverseModelTrafo * oldModelViewProj;
+
+        // compute translational portion
+        const float3 translatedPt = worldPos.xyz - oldEyePos;
+
         /////////////////
-        //-- compute reprojection for temporal smoothing
-
-        //float4x4 trafo;
-        // dynamic object
-        //if (id > 20) trafo = oldModelViewProj;
-        //else trafo = inverseModelTrafo * oldModelViewProj;
-
-        const float3 translatedPt = worldPos.xyz - oldEyePos;
-
-        // reproject into old frame and calculate texture position of sample in old frame
-        float4 backProjPos = mul(oldModelViewProj, float4(translatedPt, 1.0f));
+        //-- reproject into old frame and calculate texture position of sample in old frame
+
+        // note: the old model view matrix only holds the view orientation part
+        float4 backProjPos = mul(trafo, float4(translatedPt, 1.0f));
         backProjPos /= backProjPos.w;
+        
         // fit from unit cube into 0 .. 1
         const float2 oldTexCoords = backProjPos.xy * 0.5f + 0.5f;
         
-
         // retrieve the sample from the last frame
         const float4 oldPixel = tex2Dlod(oldTex, float4(oldTexCoords, .0f, .0f));
+
 
 #if USE_EYESPACE_DEPTH
@@ -171 +176 @@
         // vector from eye pos to old sample 
         const float3 viewVec = Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr);
-        const float invlen = 1.0f / length(viewVec);
-        const float projectedEyeSpaceDepth = invlen * length(translatedPt);
+        const float invLen = 1.0f / length(viewVec);
+        const float projectedEyeSpaceDepth = invLen * length(translatedPt);
         
         //const float depthDif = abs(oldEyeSpaceDepth - projectedEyeSpaceDepth);
-        //const float depthDif = abs(1.0f - oldEyeSpaceDepth / projectedEyeSpaceDepth);
-
-        const float depthDif = abs(projectedEyeSpaceDepth - oldEyeSpaceDepth ) / projectedEyeSpaceDepth;
+        const float depthDif = abs(1.0f - oldEyeSpaceDepth / projectedEyeSpaceDepth);
+        //const float depthDif = abs(projectedEyeSpaceDepth - oldEyeSpaceDepth ) / projectedEyeSpaceDepth;
 
 #else
@@ -345 +349 @@
                    uniform float3 oldbr,
                    uniform float3 oldtl,
-                   uniform float3 oldtr
+                   uniform float3 oldtr,
+                   uniform sampler2D attribs,
+                   uniform float4x4 inverseModelTrafo
                    )
 {
@@ -377 +383 @@
         //-- compute temporally smoothing
 
+        float id = tex2Dlod(attribs, float4(IN.texCoord, 0, 0)).x;
+
         OUT.illum_col = temporalSmoothing(eyeSpacePos, eyeSpaceDepth, ao, IN.texCoord, oldEyePos,
                                               oldTex, oldModelViewProj, temporalCoherence,
-                                              samples, colors, noiseTex, w, bl, br, tl, tr,
-                                                                          oldbl, oldbr, oldtl, oldtr, scaleFactor, projPos);
+                                              colors, w, bl, br, tl, tr, projPos, inverseModelTrafo, id,
+                                                                          noiseTex, samples, scaleFactor, oldbl, oldbr, oldtl, oldtr);
 
         //OUT.illum_col.xyz = normal * 0.5f + 0.5f;