Changeset 2884 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SsaoShader.cpp

Timestamp:

08/29/08 15:46:36 (16 years ago)

Author:

mattausch

Message:

found bug with lod levels
made env file for shaders

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SsaoShader.cpp (modified) (12 diffs)

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

@@ -5 +5 @@
 #include "Vector3.h"
 #include "Camera.h"
+#include "shaderenv.h"
 
 
@@ -13 +14 @@
 namespace CHCDemoEngine
 {
-
-// number of ssao samples
-#define NUM_SAMPLES 10
-
 
 static CGprogram sCgSsaoProgram = NULL;
@@ -49 +46 @@
 static CGparameter sNoiseMultiplierParam;
 static CGparameter sExpFactorParam;
+
 
 
@@ -137 +135 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
-        //glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, mWidth, mHeight, 0, GL_RGB, GL_UNSIGNED_BYTE, randomNormals);
+        //glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, randomNormals);
         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, w, h, 0, GL_RGB, GL_FLOAT, randomNormals);
 
@@ -183 +181 @@
 
 SsaoShader::~SsaoShader() 
-
 {
         if (sCgSsaoProgram)     cgDestroyProgram(sCgSsaoProgram);
@@ -259 +256 @@
                 sExpFactorParam = cgGetNamedParameter(sCgSsaoProgram, "expFactor");
 
-                sSamplesParam = cgGetNamedParameter(sCgSsaoProgram, "samples");
                 sOldTexParam = cgGetNamedParameter(sCgSsaoProgram, "oldTex");  
                 
+                cgGLSetParameter1f(sNoiseMultiplierParam, RandomValue(3.0f, 17.0f));
 
                 // generate samples for ssao kernel
                 GenerateSamples(); 
+
+                sSamplesParam = cgGetNamedParameter(sCgSsaoProgram, "samples");
+                //cgSetArraySize(sSamplesParam, NUM_SAMPLES);
+                //cgCompileProgram(sCgSsaoProgram);
+                
                 cgGLSetParameterArray2f(sSamplesParam, 0, NUM_SAMPLES, (const float *)samples);
-
-                cgGLSetParameter1f(sNoiseMultiplierParam, RandomValue(3.0f, 17.0f));
         }
         else
@@ -415 +415 @@
                 CombineIllum(fbo);
         }
+
         AntiAliasing(fbo);
 
@@ -439 +440 @@
         cgGLSetMatrixParameterfc(sOldModelViewProjMatrixParam, (const float *)oldProjViewMatrix.x);
 
-//      GLuint colorsTex = mFbo->GetColorBuffer(0)->GetTexture();
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();
@@ -577 +577 @@
 void SsaoShader::AntiAliasing(FrameBufferObject *fbo)
 {
-        //GLuint colorsTex = mNewFbo->GetColorBuffer(1)->GetTexture();
         GLuint colorsTex = fbo->GetColorBuffer(0)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
@@ -727 +726 @@
                 cgGLSetParameter1f(sNoiseMultiplierGiParam, RandomValue(3.0f, 17.0f));
                 cgGLSetParameter1f(sExpFactorGiParam, expFactor);
-
 
                 // q: should we generate new samples or only rotate the old ones?
@@ -774 +772 @@
 {
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
+
         GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
         GLuint illumTex = mNewFbo->GetColorBuffer(1)->GetTexture();
 
-        //
         fbo->Bind();
 
-        // write into old color texture (not needed anymore)
+        // overwrite old color texture
         glDrawBuffers(1, mymrt);
 
@@ -829 +827 @@
         GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
 
-        //
         fbo->Bind();