Changeset 2903 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

09/04/08 15:00:42 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (7 diffs)

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

@@ -153 +153 @@
 
 bool useGlobIllum = false;
-bool useSsao = false;
 bool useTemporalCoherence = true;
 
@@ -173 +172 @@
 
 DeferredRenderer::SAMPLING_METHOD samplingMethod = DeferredRenderer::POISSON;
-DeferredRenderer::SHADING_METHOD shadingMethod = DeferredRenderer::DEFAULT;
+
+bool useAdvancedShading = false;
 
 bool showShadowMap = false;
@@ -1027 +1027 @@
                 if (!ssaoShader) ssaoShader = new DeferredRenderer(texWidth, texHeight, camera, myfar / 10.0f);
                 
+                DeferredRenderer::SHADING_METHOD shadingMethod;
+
+                if (useAdvancedShading)
+                {
+                        if (useGlobIllum)
+                                shadingMethod = DeferredRenderer::GI;
+                        else
+                                shadingMethod = DeferredRenderer::SSAO;
+                }
+                else
+                        shadingMethod = DeferredRenderer::DEFAULT;
+
+
                 ssaoShader->SetShadingMethod(shadingMethod);
                 ssaoShader->SetSamplingMethod(samplingMethod);
@@ -1158 +1171 @@
                 else
                         samplingMethod = DeferredRenderer::GAUSS;
-
                 break;
         case 'Y':
@@ -1165 +1177 @@
                 break;
         case 'g':
+        case 'G':
+                useGlobIllum = !useGlobIllum;
+                break;
         case 't':
         case 'T':
@@ -1300 +1315 @@
                 break;
         case GLUT_KEY_F8:
-                //shadingMethod = (DeferredRenderer::SHADING_METHOD)((shadingMethod + 1) % 3);
-                shadingMethod = (DeferredRenderer::SHADING_METHOD)((shadingMethod + 1) % 2);
-                
+
+                useAdvancedShading = !useAdvancedShading;
+                //shadingMethod = (DeferredRenderer::SHADING_METHOD)((shadingMethod + 1) % 2);
+
                 break;
         case GLUT_KEY_F9:
@@ -1735 +1751 @@
                                                         useMultiQueries, useTightBounds, useRenderQueue);
 
-                        sprintf(msg[i ++], "render technique: %s, SSAO: %d", renderTypeStr[renderType], useSsao);
+                        sprintf(msg[i ++], "render technique: %s, SSAO: %d", renderTypeStr[renderType], useAdvancedShading);
 
                         sprintf(msg[i ++], "triangles per virtual leaf: %5d", trianglesPerVirtualLeaf);