Changeset 2891 for GTP/trunk/App

Timestamp:

09/01/08 08:58:38 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• Camera.cpp (modified) (1 diff)
• Light.cpp (added)
• Light.h (added)
• ShadowMapping.cpp (added)
• ShadowMapping.h (added)
• SsaoShader.cpp (modified) (12 diffs)
• SsaoShader.h (modified) (2 diffs)
• Visualization.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (3 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/antialiasing.cg (modified) (3 diffs)
• shaders/globillum.cg (modified) (3 diffs)
• shaders/mrt.cg (modified) (1 diff)
• shaders/shadow.cg (modified) (1 diff)
• shaders/ssao.cg (modified) (6 diffs)

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

@@ -175 +175 @@
         float z_far = mFar;
 
-        float fov = 120 * M_PI / 180.0f;//mFovy;
+        float fov = mFovy;
 
         const float w_near = 2.0f * tan(fov * 0.5f) * z_near;

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

@@ -193 +193 @@
 mUseTemporalCoherence(true),
 mUseGlobIllum(false),
-mSampling(POISSON)
+mSampling(POISSON),
+mFboIndex(0)
 {
         // create noise texture for ssao
@@ -201 +202 @@
         //-- the flip-flop fbos
 
-        mNewFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
+        /*mNewFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
         
         mNewFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
@@ -212 +213 @@
         
         mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
-        mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
-        
-        //mFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
-        //mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);*/
+        mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);*/
+        
+        mFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
+
+        mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
+        mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
+        mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
+        mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
 }
 
@@ -227 +232 @@
         if (sCgAntiAliasingProgram) cgDestroyProgram(sCgAntiAliasingProgram);
 
-        DEL_PTR(mNewFbo);
-        DEL_PTR(mOldFbo);
-        //DEL_PTR(mFbo);
+        //DEL_PTR(mNewFbo);
+        //DEL_PTR(mOldFbo);
+        DEL_PTR(mFbo);
 
         glDeleteTextures(1, &noiseTex);
@@ -418 +423 @@
         // contais the color buffer from the last frame, 
         // the other one will be written
-        swap(mNewFbo, mOldFbo); 
-
+        //swap(mNewFbo, mOldFbo);       
+        mFboIndex = 2 - mFboIndex;
         FrameBufferObject::Release();
 
@@ -492 +497 @@
 
         // read the second buffer, write to the first buffer
-        mNewFbo->Bind();
-        glDrawBuffers(1, mymrt);
-
-
-        GLuint oldTex = mOldFbo->GetColorBuffer(0)->GetTexture();
+        //mNewFbo->Bind();
+        mFbo->Bind();
+        glDrawBuffers(1, mymrt + mFboIndex);
+
+
+        //GLuint oldTex = mOldFbo->GetColorBuffer(0)->GetTexture();
+        GLuint oldTex = mFbo->GetColorBuffer(2 - mFboIndex)->GetTexture();
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -545 +552 @@
         //const float new_offs = 0.55f;
         const float new_offs = 0.5f;
-        /*
-        glTexCoord2f(0, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tl.x, tl.y, tl.z); glVertex3f(-new_offs, -new_offs, -0.5f);
-        glTexCoord2f(1, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tr.x, tr.y, tr.z); glVertex3f( new_offs, -new_offs, -0.5f);
-        glTexCoord2f(1, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, br.x, br.y, br.z); glVertex3f( new_offs,  new_offs, -0.5f);
-        glTexCoord2f(0, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, bl.x, bl.y, bl.z); glVertex3f(-new_offs,  new_offs, -0.5f);
-*/
+        
         glTexCoord2f(0, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, bl.x, bl.y, bl.z); glVertex3f(-new_offs, -new_offs, -0.5f);
         glTexCoord2f(1, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, br.x, br.y, br.z); glVertex3f( new_offs, -new_offs, -0.5f);
@@ -715 +717 @@
 
         // read the second buffer, write to the first buffer
-        mNewFbo->Bind();
-        glDrawBuffers(2, mymrt);
-
-        GLuint oldSsaoTex = mOldFbo->GetColorBuffer(0)->GetTexture();
-        GLuint oldIllumTex = mOldFbo->GetColorBuffer(1)->GetTexture();
+        //mNewFbo->Bind();
+        mFbo->Bind();
+
+        glDrawBuffers(2, mymrt + mFboIndex);
+
+        //GLuint oldSsaoTex = mOldFbo->GetColorBuffer(0)->GetTexture();
+        //GLuint oldIllumTex = mOldFbo->GetColorBuffer(1)->GetTexture();
+        
+        GLuint oldSsaoTex = mFbo->GetColorBuffer(2 - mFboIndex)->GetTexture();
+        GLuint oldIllumTex = mFbo->GetColorBuffer(2 - mFboIndex + 1)->GetTexture();
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -766 +773 @@
         ComputeViewVectors(tl, tr, bl, br);
 
-        glColor3f(1.0f, 1.0f, 1.0f);
-
         glBegin(GL_QUADS);
 
@@ -773 +778 @@
         //const float new_offs = 0.55f;
         const float new_offs = 0.5f;
-        
-        glColor3f(bl.x, bl.y, bl.z); glTexCoord2f(0, 0); glVertex3f(-new_offs, -new_offs, -0.5f);
-        glColor3f(br.x, br.y, br.z); glTexCoord2f(1, 0); glVertex3f( new_offs, -new_offs, -0.5f);
-        glColor3f(tr.x, tr.y, tr.z); glTexCoord2f(1, 1); glVertex3f( new_offs,  new_offs, -0.5f);
-        glColor3f(tl.x, tl.y, tl.z); glTexCoord2f(0, 1); glVertex3f(-new_offs,  new_offs, -0.5f);
+                
+        glTexCoord2f(0, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, bl.x, bl.y, bl.z); glVertex3f(-new_offs, -new_offs, -0.5f);
+        glTexCoord2f(1, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, br.x, br.y, br.z); glVertex3f( new_offs, -new_offs, -0.5f);
+        glTexCoord2f(1, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tr.x, tr.y, tr.z); glVertex3f( new_offs,  new_offs, -0.5f);
+        glTexCoord2f(0, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tl.x, tl.y, tl.z); glVertex3f(-new_offs,  new_offs, -0.5f);
 
         glEnd();
@@ -798 +803 @@
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
 
-        GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
-        GLuint illumTex = mNewFbo->GetColorBuffer(1)->GetTexture();
+        //GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
+        //GLuint illumTex = mNewFbo->GetColorBuffer(1)->GetTexture();
+        GLuint ssaoTex = mFbo->GetColorBuffer(mFboIndex)->GetTexture();
+        GLuint illumTex = mFbo->GetColorBuffer(mFboIndex + 1)->GetTexture();
+
 
         fbo->Bind();
@@ -850 +858 @@
 {
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
-        GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
+        //GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
+        GLuint ssaoTex = mFbo->GetColorBuffer(mFboIndex)->GetTexture();
 
         fbo->Bind();

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

@@ -80 +80 @@
         Camera *mCamera;
 
-        FrameBufferObject *mOldFbo;
-        FrameBufferObject *mNewFbo;
-        //FrameBufferObject *mFbo;
+        //FrameBufferObject *mOldFbo;
+        //FrameBufferObject *mNewFbo;
+        FrameBufferObject *mFbo;
 
         bool mUseGlobIllum;
@@ -88 +88 @@
 
         int mSampling;
+        int mFboIndex;
 };
 

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

@@ -151 +151 @@
 
         RenderFrustum();
+
+        Vector3 pos = mCamera->GetPosition();
+
+        // coordinates
+        glColor3f(0.0f, 1.0f, 0.0f);
+        glBegin(GL_LINES);
+        glVertex3d(pos.x, pos.y, pos.z);
+        glVertex3d(pos.x + 100, pos.y, pos.z);
+        glEnd();
+
+        glColor3f(0.0f, 0.0f, 1.0f);
+        glBegin(GL_LINES);
+        glVertex3d(pos.x, pos.y, pos.z);
+        glVertex3d(pos.x, pos.y + 100, pos.z);
+        glEnd();
+
         //RenderBoxForViz(mBvh->GetBox());
         

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

@@ -550 +550 @@
 
         // the diffuse color buffer
-        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_MIPMAP_LINEAR, true);
-        //fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, false);
+        //fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_MIPMAP_LINEAR, true);
+        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, false);
 
         // the positions buffer
@@ -1544 +1544 @@
         visualization->Render();
 
-        // coordinates
-        glColor3f(0.0f, 1.0f, 0.0f);
-        glBegin(GL_LINES);
-        glVertex3d(pos.x, pos.y, pos.z);
-        glVertex3d(pos.x + 100, pos.y, pos.z);
-        glEnd();
-
-        glColor3f(0.0f, 0.0f, 1.0f);
-        glBegin(GL_LINES);
-        glVertex3d(pos.x, pos.y, pos.z);
-        glVertex3d(pos.x, pos.y + 100, pos.z);
-        glEnd();
+        
         
         // reset previous settings
@@ -1564 +1553 @@
         glMatrixMode(GL_MODELVIEW);
         glPopMatrix();
-
-        Vector3 ftl, ftr, fbl, fbr, ntl, ntr, nbl, nbr;
-
-        camera->ComputePoints(ftl, ftr, fbl, fbr, ntl, ntr, nbl, nbr);
-
-        Vector3 bl, br, tl, tr;
-
-        bl = Normalize(nbl - fbl) * 100;
-        br = Normalize(nbr - fbr) * 100;
-        tl = Normalize(ntl - ftl) * 100;
-        tr = Normalize(ntr - ftr) * 100;
-
-        Vector3 dum = pos + camera->GetDirection() * 20;
-
-        // coordinates
-        glColor3f(0.0f, 1.0f, 0.0f);
-
-        glBegin(GL_LINES);
-        glVertex3d(dum.x, dum.y, dum.z);
-        glVertex3d(dum.x + bl.x, dum.y + bl.y, dum.z + bl.z);
-        glEnd();
-
-/*      glColor3f(1.0f, 0.0f, 0.0f);
-
-        glBegin(GL_LINES);
-        glVertex3d(dum.x, dum.y, dum.z);
-        glVertex3d(dum.x + br.x, dum.y + br.y, dum.z + br.z);
-        glEnd();
-
-*/      glColor3f(0.0f, 0.0f, 1.0f);
-
-        glBegin(GL_LINES);
-        glVertex3d(dum.x, dum.y, dum.z);
-        glVertex3d(dum.x + tl.x, dum.y + tl.y, dum.z + tl.z);
-        glEnd();
-/*
-        glColor3f(1.0f, 0.0f, 1.0f);
-
-        glBegin(GL_LINES);
-        glVertex3d(dum.x, dum.y, dum.z);
-        glVertex3d(dum.x + tr.x, dum.y + tr.y, dum.z + tr.z);
-        glEnd();*/
 }
 

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

@@ -2 +2 @@
 #define __SHADERENV_H
 
-//#define NUM_SAMPLES 8
-#define NUM_SAMPLES 16
+#define NUM_SAMPLES 8
+//#define NUM_SAMPLES 16
 
 // rule of thumb: approx 1 / NUM_SAMPLES
-#define SAMPLE_INTENSITY 0.14f
-//#define SAMPLE_INTENSITY 0.28f
+//#define SAMPLE_INTENSITY 0.14f
+#define SAMPLE_INTENSITY 0.28f
 
 #define AREA_SIZE 5e-1f

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

@@ -13 +13 @@
 uniform float4 e_barrier = float4(5e-5, 5e-5, 0, 0); // x = normal, y = depth
 // the weights for normal / depth discontinuity
-//uniform float4 e_weights = float4(10.0f, 0.1f, 1.0f, 1.0f); // x = normal, y = depth
-uniform float4 e_weights = float4(1.0f, 1.0f, 1.0f, 1.0f); // x = normal, y = depth
-uniform float4 e_kernel = float4(0.35f, 1.0f, 1.0f, 1.0f); 
+uniform float4 e_weights = float4(0.5f, 0.5f, 1.0f, 1.0f); // x = normal, y = depth
+//uniform float4 e_weights = float4(1.0f, 1.0f, 1.0f, 1.0f); // x = normal, y = depth
+uniform float4 e_kernel = float4(0.5f, 1.0f, 1.0f, 1.0f); 
 
 
@@ -34 +34 @@
         nd.w = dot(nc, float3(tex2D(normals, IN.lb.xy)));
 
-        nd.x -= e_barrier.x;
+        nd -= e_barrier.x;
         nd = step((float4)0.0f, nd);
 
@@ -84 +84 @@
         float4 s3 = tex2Dlod(colors, float4(offset + IN.lb.xy * w, 0, 0));
 
-        //float4 sx = tex2D(colors, IN.c.xy);
+        float4 sc = tex2Dlod(colors, float4(IN.c.xy, 0, 0));
 
-        return (s0 + s1 + s2 + s3) * 0.25f;
+        return (s0 + s1 + s2 + s3 + sc) * 0.2f;
+        //return (s0 + s1 + s2 + s3) * 0.25f;
         //return float4(w);
 }

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

@@ -29 +29 @@
 
 
-float2 reflect(float2 pt, float2 n)
+float2 myreflect(float2 pt, float2 n)
 {
         // distance to plane
@@ -67 +67 @@
         for (int i = 0; i < NUM_SAMPLES; i ++) 
         {
-                float2 offset = samples[i];
+                //float2 offset = samples[i];
+                float3 offset = float3(samples[i], 0);
 
                 //sample noisetex; r stores costheta, g stores sintheta
-                //float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
-                float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy;
+                //float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy;
+                float3 mynoise = float3(tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy, 0);
 
                 // rotation
@@ -133 +134 @@
         // expand normal
         float3 normal = normalize(norm.xyz);
+
         /// the current view direction
-        float3 viewDir = normalize(IN.view * 2.0f - float3(1.0f));
+        float3 viewDir;// = normalize(IN.view);
 
         // the current world position

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

@@ -24 +24 @@
 struct fragin
 {
-  float4 position: POSITION; // eye space
-  float4 texCoord: TEXCOORD0;    
+        float4 color: COLOR0;  
+        float4 position: POSITION; // eye space
+        float4 texCoord: TEXCOORD0;    
 
-  float4 projPos: WPOS;
-  float4 color: COLOR0;  
-  float4 worldPos: TEXCOORD1; // world position
-  float3 normal: TEXCOORD2;
+        float4 projPos: WPOS;
+        float4 worldPos: TEXCOORD1; // world position
 
-  float4 mypos: TEXCOORD3;
-  //float DEPTH;
+        float3 normal: TEXCOORD2;
+
+        float4 mypos: TEXCOORD3;
+        //float DEPTH;
 };
 

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

@@ -1 @@
-//----------------------------------------------------------------------------------
-// File:   shadow_single_fragment.glsl
-// Author: Rouslan Dimitrov
-// Email:  sdkfeedback@nvidia.com
-// Cascaded shadows maps, single shadow sample
-// Copyright (c) NVIDIA Corporation. All rights reserved.
-//----------------------------------------------------------------------------------
-#version 120
-#extension GL_EXT_texture_array : enable
+struct appdata {
+        float3 Position : POSITION;
+        float3 Normal : NORMAL;
+};
 
-uniform sampler2D tex;
-uniform vec4 far_d;
 
-varying vec4 vPos;
+struct vpconn {
+        float4 Hposition : POSITION;
+        float4 TexCoord0 : TEXCOORD0;
+        float4 TexCoord1 : TEXCOORD1;
+        float4 Color0 : COLOR0;
+};
 
-uniform sampler2DArray stex;
-float shadowCoef()
+
+vpconn main(appdata IN,
+                        uniform float4x4 WorldViewProj,
+                        uniform float4x4 TexTransform,
+                        uniform float3x3 WorldIT,
+                        uniform float3 LightVec)
 {
-        int index = 3;
+        vpconn OUT;
         
-        // find the appropriate depth map to look up in based on the depth of this fragment
-        if(gl_FragCoord.z < far_d.x)
-                index = 0;
-        else if(gl_FragCoord.z < far_d.y)
-                index = 1;
-        else if(gl_FragCoord.z < far_d.z)
-                index = 2;
+        float3 worldNormal = normalize(mul(WorldIT, IN.Normal));
         
-        // transform this fragment's position from view space to scaled light clip space
-        // such that the xy coordinates are in [0;1]
-        // note there is no need to divide by w for othogonal light sources
-        vec4 shadow_coord = gl_TextureMatrix[index]*vPos;
-
-        shadow_coord.w = shadow_coord.z;
+        float ldotn = max(dot(LightVec, worldNormal), 0.0);
+        OUT.Color0.xyz = ldotn.xxx;
         
-        // tell glsl in which layer to do the look up
-        shadow_coord.z = float(index);
+        float4 tempPos;
+        tempPos.xyz = IN.Position.xyz;
+        tempPos.w = 1.0;
         
-        // get the stored depth
-        float shadow_d = texture2DArray(stex, shadow_coord.xyz).x;
+        OUT.TexCoord0 = mul(TexTransform, tempPos);
+        OUT.TexCoord1 = mul(TexTransform, tempPos);
         
-        // get the difference of the stored depth and the distance of this fragment to the light
-        float diff = shadow_d - shadow_coord.w;
+        OUT.Hposition = mul(WorldViewProj, tempPos);
         
-        // smoothen the result a bit, to avoid aliasing at shadow contact point
-        return clamp( diff*250.0 + 1.0, 0.0, 1.0);
+        return OUT;
 }
 
-void main()
+
+struct v2f_simple {
+        float4 Hposition : POSITION;
+        float4 TexCoord0 : TEXCOORD0;
+        float4 TexCoord1 : TEXCOORD1;
+        float4 Color0 : COLOR0;
+};
+
+
+float4 main(v2f_simple IN,
+                        uniform sampler2D ShadowMap,
+                        uniform sampler2D SpotLight) : COLOR
 {
-    const float shadow_ambient = 0.9;
-        vec4 color_tex = texture2D(tex, gl_TexCoord[0].st);
-        float shadow_coef = shadowCoef();
-        float fog = clamp(gl_Fog.scale*(gl_Fog.end + vPos.z), 0.0, 1.0);
-        gl_FragColor = mix(gl_Fog.color, (shadow_ambient * shadow_coef * gl_Color * color_tex + (1.0 - shadow_ambient) * color_tex), fog);
+        float4 shadow = tex2D(ShadowMap, IN.TexCoord0.xy);
+        float4 spotlight = tex2D(SpotLight, IN.TexCoord1.xy);
+        float4 lighting = IN.Color0;
+        return shadow * spotlight * lighting;
 }

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

@@ -4 +4 @@
 // Screen Spaced Ambient Occlusion shader
 // based on shader of Alexander Kusternig
-
 
 
@@ -22 +21 @@
 
 
-float2 reflect(float2 pt, float2 n)
+float2 myreflect(float2 pt, float2 n)
 {
         // distance to plane
@@ -57 +56 @@
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
         {
-                const float2 offset = samples[i];
+                //const float2 offset = samples[i];
+                const float3 offset = float3(samples[i], 0);
 
                 ////////////////////
@@ -63 +63 @@
 
                 //const float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
-                float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy;
+                //float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy;
+                float3 mynoise = float3(tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy,0);
 
                 const float2 offsetTransformed = reflect(offset, mynoise);
@@ -123 +124 @@
         // expand normal
         float3 normal = normalize(norm.xyz);
+        
         /// the current view direction
-        //float3 viewDir = normalize(IN.view * 2.0f - float3(1.0f));
-        float3 viewDir = normalize(IN.view);
+        float3 viewDir;// = normalize(IN.view);
 
         // the current world position
@@ -182 +183 @@
         float4 ao = tex2D(ssaoTex, IN.texCoord.xy);
 
-        //OUT.illum_col = col * ao.x;
-        OUT.illum_col = ao;
+        OUT.illum_col = col * ao.x;
+        //OUT.illum_col = ao;
 
         OUT.illum_col.w = ao.w;