Changeset 2964

Timestamp:

09/22/08 18:33:55 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• BvhLoader.cpp (modified) (1 diff)
• Material.cpp (modified) (2 diffs)
• RenderState.cpp (modified) (1 diff)
• RenderState.h (modified) (1 diff)
• Texture.h (modified) (1 diff)
• chcdemo.cpp (modified) (8 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/globillum.cg (modified) (1 diff)
• shaders/mrt.cg (modified) (1 diff)
• shaders/ssao.cg (modified) (1 diff)
• shaders/ssao3d.cg (modified) (1 diff)

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

@@ -118 +118 @@
         }
 
-        cout << "... finished loading " << bvh->mNumNodes << " scene box: " << bvh->mBox << endl;
 
         bvh->mBox = bvh->mRoot->GetBox();
+
+        cout << "... finished loading " << bvh->mNumNodes << " nodes" << endl;
+        cout << "scene box: " << bvh->mBox << endl;
 
         

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

@@ -22 +22 @@
 
         mAmbientColor = RgbaColor(0.2f, 0.2f, 0.2f, 1.0f);
-        //mAmbientColor = RgbaColor(1.0f, 1.0f, 1.0f, 1.0f);
         mDiffuseColor = RgbaColor(1.0f, 1.0f, 1.0f, 1.0f);
         mSpecularColor = RgbaColor(.0f, .0f, .0f, 1.0f);
@@ -60 +59 @@
         state->SetState(mTexture != NULL, mAlphaTestEnabled, mCullFaceEnabled);
 
-        if (mTexture)
-                mTexture->Bind();
+        if (state->GetRenderPassType() == RenderState::DEFERRED)
+        {
+                if (mTexture)
+                {
+                        cgGLSetTextureParameter(RenderState::sTexParam, mTexture->GetId());
+                        cgGLEnableTextureParameter(RenderState::sTexParam);
+                        cgGLEnableTextureParameter(RenderState::sDirtTexParamTex);
+                }
+                else
+                {
+                        cgGLDisableTextureParameter(RenderState::sTexParam);
+                }
+        }
         else
-                glBindTexture(GL_TEXTURE_2D, 0);
+        {
+                if (mTexture)
+                        mTexture->Bind();
+                else
+                        glBindTexture(GL_TEXTURE_2D, 0);
+        }
 
         glMaterialfv(GL_FRONT, GL_AMBIENT, (float *)&mAmbientColor.r);

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

@@ -13 +13 @@
 CGprogram RenderState::sCgMrtFragmentProgram = NULL;
 CGprogram RenderState::sCgMrtFragmentTexProgram = NULL;
+CGparameter RenderState::sTexParam;
+CGparameter RenderState::sDirtTexParamTex;
+
 
 

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

@@ -81 +81 @@
         static CGprogram sCgMrtFragmentTexProgram;
 
+        static CGparameter sTexParam;
+
+        static CGparameter sDirtTexParamTex;
 
 protected:

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

@@ -62 +62 @@
         */
         void Create();
-        
+        /** Returns id of this texture.
+        */
+        int GetId() const { return mTexId; }
 
 

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

@@ -39 +39 @@
 #include "ObjConverter.h"
 #include "SkyPreetham.h"
+#include "Texture.h"
 
 
@@ -167 +168 @@
 PerfTimer frameTimer, algTimer;
 
+Texture *dirtTexture = NULL;
+
 
 /// the used render type for this render pass
@@ -269 +272 @@
 static CGparameter sMaxDepthParam;
 static CGparameter sMaxDepthParamTex;
+
 static Matrix4x4 oldViewProjMatrix;
 
@@ -454 +458 @@
         camera->SetFar(Magnitude(bvh->GetBox().Diagonal()));
         
+        dirtTexture = new Texture(model_path + "waterstain.jpg");
+        //dirtTexture = new Texture(model_path + "dirt.jpg");
+        dirtTexture->Create();
+
         InitCg();
 
@@ -470 +478 @@
         
         //const string aeroplaneStr = model_path + "toyplane.dem";
-        const string aeroplaneStr = model_path + "city_full.dem";
+        //const string aeroplaneStr = model_path + "city_full.dem";
 
         SceneEntityContainer dummy;
 
-        if (loader->Load(aeroplaneStr, dummy))
-                cout << "successfully loaded " << dummy.size() << " scene entities" << endl;
-        else
-        {
-                cerr << "loading file " << aeroplaneStr << " failed" << endl;
-
-                CleanUp();
-                exit(0);
-        }
-
+        
         string skyDomeStr(model_path + "sky.dem");
 
@@ -496 +495 @@
         }
 
-        aeroplane = dummy[0];
-        skyDome = dummy[1];
+        skyDome = dummy[0];
+
+
+        /*if (loader->Load(aeroplaneStr, dummy))
+                cout << "successfully loaded " << dummy.size() << " scene entities" << endl;
+        else
+        {
+                cerr << "loading file " << aeroplaneStr << " failed" << endl;
+
+                CleanUp();
+                exit(0);
+        }
+
+        aeroplane = dummy[1];
 
         aeroplane->GetTransform()->MultMatrix(transl);
-
+*/
         const float turbitiy = 3.0f;
         preetham = new SkyPreetham(turbitiy, skyDome);
@@ -569 +580 @@
 
                 sMaxDepthParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "maxDepth");
+                RenderState::sDirtTexParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "dirtTex");
+                RenderState::sTexParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tex");
+
+                cgGLEnableTextureParameter(RenderState::sDirtTexParamTex);
+                cgGLSetTextureParameter(RenderState::sDirtTexParamTex, dirtTexture->GetId());
 
                 cgGLSetParameter1f(sMaxDepthParamTex, MAX_DEPTH_CONST / farDist);
@@ -1086 +1102 @@
         {
                 // actually render the scene geometry using the specified algorithm
-                //traverser->RenderScene();
+                traverser->RenderScene();
+        /*
                 state.Reset();
-        /*      SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
+                aeroplane->Render(&state);
+
+        SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
 
                 for (sit = sceneEntities.begin(); sit != sit_end; ++ sit)
                 {
                         renderQueue->Enqueue(*sit);
-                }*/
-
-                aeroplane->Render(&state);
+                }
 
                 renderQueue->Apply();
+                */
         }
 

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

@@ -29 +29 @@
 //#define ILLUM_INTENSITY 9e-1f;
 
+#define SSAO_MIPMAP_LEVEL 1
+#define GI_MIPMAP_LEVEL 2
 
 #endif // __SHADERENV_H

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

@@ -92 +92 @@
 
                 // use lower lod level to improve cache coherence
-                float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, 1)).xyz;
-                float3 sample_color = tex2Dlod(colors, float4(texcoord, 0, 2)).xyz;
+                float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
+                float3 sample_color = tex2Dlod(colors, float4(texcoord, 0, GI_MIPMAP_LEVEL)).xyz;
 
                 float3 vector_to_sample = sample_position - centerPosition.xyz;

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

@@ -66 +66 @@
 
 pixel fragtex(fragin IN, 
-                          uniform sampler2D tex, 
-                          uniform float maxDepth)
+                          uniform sampler2D dirtTex,
+                          uniform float maxDepth,
+                          uniform sampler2D tex)
 {
         pixel pix;
 
+        //float4 dirtTexColor = tex2D(dirtTex, IN.texCoord.xy);
+        float4 texColor = tex2D(tex, IN.texCoord.xy);
+
         // save color in first render target
         // hack: use comination of emmisive + diffuse (emmisive used as constant ambient term)
-        pix.col = (glstate.material.emission + glstate.material.diffuse) * tex2D(tex, IN.texCoord.xy);
+        //pix.col = (glstate.material.emission + glstate.material.diffuse) * texColor * dirtTexColor; 
+        pix.col = (glstate.material.emission + glstate.material.diffuse) * texColor; 
         
         // save world position in second render target

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

@@ -73 +73 @@
 
                 // sample downsampled texture in order to speed up texture accesses
-                float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, 1)).xyz;
+                float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
                 //float3 sample_position = tex2D(positions, texcoord).xyz;
 

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

@@ -76 +76 @@
                         ++ j;
                         // sample downsampled texture in order to speed up texture accesses
-                        float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, 1)).xyz;
+                        float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
                         //float3 sample_position = tex2D(positions, texcoord).xyz;