Changeset 3360 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

04/17/09 17:37:38 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (10 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/deferred.cg (modified) (1 diff)
• shaders/mrt.cg (modified) (2 diffs)

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

@@ -674 +674 @@
                 FilterSsao(fbo);
                 CombineSsao(fbo);
+
                 break;
         case GI:

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

@@ -551 +551 @@
         camera = new PerspectiveCamera(winWidth / winHeight, fov);
         camera->SetNear(nearDist);
-        camera->SetFar(1000);
+        camera->SetFar(1e6f);
 
         camera->SetDirection(camDir);
@@ -621 +621 @@
         //resourceManager->mUseNormalMapping = true;
         //resourceManager->mUseNormalMapping = false;
-
         resourceManager->mUseSpecialColors = true;
 
@@ -632 +631 @@
 
         if (0) LoadPompeiiFloor();
-
+#if 1
 
 #if 0
@@ -647 +646 @@
         VertexArray positions;
         
+        // for buddha (lowres)
         /*positions.push_back(Vector3(6.07307, 8.20723, 6.62));
         positions.push_back(Vector3(-17.1935, 11.1687, 8.8781));
         positions.push_back(Vector3(1.50032, 31.1943, 19.1f));*/
 
-        positions.push_back(Vector3(6.07307, 8.20723, 4.6f));
-        positions.push_back(Vector3(-17.1935, 11.1687, 6.8f));
-        positions.push_back(Vector3(1.50032, 31.1943, 17.6f));
+        // for happy buddha
+        //positions.push_back(Vector3(6.07307, 8.20723, 4.6f));
+        //positions.push_back(Vector3(-17.1935, 11.1687, 6.8f));
+        //positions.push_back(Vector3(1.50032, 31.1943, 17.6f));
+
+        // for dragon
+        //positions.push_back(Vector3(6.07307, 8.20723, 5.0f));
+        positions.push_back(Vector3(0, 0, -0.8));
 
 #endif
@@ -661 +666 @@
         
         //LoadModel("hbuddha.dem", dynamicObjects);
-        //LoadModel("horse.dem", dynamicObjects);
-        LoadModel("happy.dem", dynamicObjects);
+        LoadModel("horse.dem", dynamicObjects);
+        //LoadModel("happy.dem", dynamicObjects);
+        //LoadModel("dragon.dem", dynamicObjects);
         //LoadModel("torus.dem", dynamicObjects);
         //LoadModel("venusm.dem", dynamicObjects);
@@ -680 +686 @@
 
         // hack: second buddha
-        dynamicObjects[2]->GetTransform()->MultMatrix(rotMatrix);
-        dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
         dynamicObjects[0]->GetTransform()->MultMatrix(rotMatrix);
         dynamicObjects[0]->GetTransform()->MultMatrix(scaleMatrix);
-        dynamicObjects[1]->GetTransform()->MultMatrix(scaleMatrix);
-        dynamicObjects[2]->GetTransform()->MultMatrix(scaleMatrix);
+
+        //dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
+        //dynamicObjects[1]->GetTransform()->MultMatrix(scaleMatrix);
+
+        //dynamicObjects[2]->GetTransform()->MultMatrix(rotMatrix);
+        //dynamicObjects[2]->GetTransform()->MultMatrix(scaleMatrix);
 
         cout << "dynamic objects: " << (int)dynamicObjects.size() << endl;
+
+        CreateAnimation(positions[0]);
+#endif
 
         // hack
@@ -722 +733 @@
 
         // set far plane based on scene extent
-        farDist = 10.0f * Magnitude(bvh->GetBox().Diagonal());
+        //farDist = 10.0f * Magnitude(bvh->GetBox().Diagonal());
+        farDist = 1000.0f;
         camera->SetFar(farDist);
 
@@ -739 +751 @@
         /// the turbitity of the sky (from clear to hazy, use <3 for clear sky)
         preetham = new SkyPreetham(turbitity, skyDome);
-
-        CreateAnimation(positions[0]);
 
 
@@ -1606 +1616 @@
                 break;
         case '9':
-                ssaoKernelRadius *= 0.8f;
+                ssaoKernelRadius *= .8f;
                 cout << "new ssao kernel radius: " << ssaoKernelRadius << endl;
                 if (deferredShader) deferredShader->SetKernelRadius(ssaoKernelRadius);
                 break;
         case '0':
-                ssaoKernelRadius *= 1.0f / 0.8f;
+                ssaoKernelRadius *= 1.0f / .8f;
                 if (deferredShader) deferredShader->SetKernelRadius(ssaoKernelRadius);
                 cout << "new ssao kernel radius: " << ssaoKernelRadius << endl;
                 break;
         case 'n':
-                ssaoSampleIntensity *= 0.9f;
+                ssaoSampleIntensity *= .9f;
                 if (deferredShader) deferredShader->SetSampleIntensity(ssaoSampleIntensity);
                 cout << "new ssao sample intensity: " << ssaoSampleIntensity << endl;
                 break;
         case 'N':
-                ssaoSampleIntensity *= 1.0f / 0.9f;
+                ssaoSampleIntensity *= 1.0f / .9f;
                 if (deferredShader) deferredShader->SetSampleIntensity(ssaoSampleIntensity);
                 cout << "new ssao sample intensity: " << ssaoSampleIntensity << endl;
@@ -1671 +1681 @@
         case 'T':
                 useTemporalCoherence = !useTemporalCoherence;
+                cout << "using temporal coherence " << useTemporalCoherence << endl;
                 break;
         case 'a':

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

@@ -6 +6 @@
 //-- ssao + gi parameters
 
-#define NUM_PRECOMPUTED_SAMPLES 8124
+//#define NUM_PRECOMPUTED_SAMPLES 8124
+#define NUM_PRECOMPUTED_SAMPLES 4096
+//#define NUM_PRECOMPUTED_SAMPLES 2048
 
 //#define NUM_SAMPLES 8

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

@@ -40 +40 @@
 
         // hack: prevent to shade the sky
-#if 0
+#if 1
         if (color.w > DEPTH_THRESHOLD)
         {

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

@@ -102 +102 @@
         //pix.id = glstate.fog.color.xyz;
         // the offset to the world pos from old frame
+        //pix.offsVec = float3(0,0,0);
         pix.offsVec = IN.oldWorldPos.xyz - IN.worldPos.xyz;
 
@@ -124 +125 @@
         // the offset to the world pos from old frame
         pix.offsVec = IN.oldWorldPos.xyz - IN.worldPos.xyz;
+        //pix.offsVec = float3(0,0,0);
 
         return pix;