Changeset 2851

Timestamp:

08/19/08 11:38:08 (16 years ago)

Author:

mattausch

Message:

using sample_to_coverage instead of alpha

Location:

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

Files:

• RenderState.cpp (modified) (2 diffs)
• ResourceManager.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (6 diffs)
• shaders/mrt.cg (modified) (1 diff)

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

@@ -88 +88 @@
         {
                 mCullFaceEnabled = true;
-                //glEnable(GL_CULL_FACE);
+                glEnable(GL_CULL_FACE);
         }
 
@@ -94 +94 @@
         {
                 mAlphaTestEnabled = false;
-                glDisable(GL_ALPHA_TEST);
+                
+                // not needed with GL_SAMPLE_ALPHA_TO_COVERAGE_ARB
+                //glDisable(GL_ALPHA_TEST);
+                glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
         }
         else if (!mAlphaTestEnabled && alphaTest)
         {
                 mAlphaTestEnabled = true;
-                glEnable(GL_ALPHA_TEST);
+                
+                // not needed with GL_SAMPLE_ALPHA_TO_COVERAGE_ARB
+                //glEnable(GL_ALPHA_TEST);
+                glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
         }
 

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

@@ -69 +69 @@
 
                 // hack
-                distance = i * 20;
+                //if (i >= 3) distance = 30000;
 
                 int numShapes;
                 str.read(reinterpret_cast<char *>(&numShapes), sizeof(int));
 
-                //if (numLODs > 1) cout << "dist: " << distance << " shapes: " << numShapes;
+                //if (numLODs > 1) cout << "dist: " << distance << " shapes: " << numShapes << endl;
 
                 LODLevel *lodLevel = new LODLevel(distance);
@@ -94 +94 @@
                         lodLevel->AddShape(shape);
                 }
-
-                //if (numLODs > 1) cout << endl;
 
                 sceneGeom->AddLODLevel(lodLevel);

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

@@ -376 +376 @@
         glutInitWindowSize(winWidth, winHeight);
         glutInit(&argc, argv);
-        glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_MULTISAMPLE);
+        //glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_MULTISAMPLE);
+        glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH);
 
         //glutInitDisplayString("samples=2");
@@ -402 +403 @@
         InitGLstate();
 
-        glEnable(GL_MULTISAMPLE_ARB);
-        glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
-        glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);
+        //glEnable(GL_MULTISAMPLE_ARB);
+        //glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);
 
         InitFBO();
@@ -869 +869 @@
         glFrontFace(GL_CCW);
         glCullFace(GL_BACK);
-        //glEnable(GL_CULL_FACE);
-        
-        glDisable(GL_CULL_FACE);
+        glEnable(GL_CULL_FACE);
+
+        //glDisable(GL_CULL_FACE);
         glDisable(GL_TEXTURE_2D);
 
@@ -1138 +1138 @@
         case RenderState::FIXED:
         
+                glEnable(GL_MULTISAMPLE_ARB);
+                //glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
+
                 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
 
@@ -1153 +1156 @@
 
         case RenderState::DEPTH_PASS:
+
+                glEnable(GL_MULTISAMPLE_ARB);
+                //glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
+
                 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
 
@@ -1170 +1177 @@
         
         case RenderState::DEFERRED:
+
+                // multisampling not working with deferred shading
+                //glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
+                glDisable(GL_MULTISAMPLE_ARB);
+
                 state.SetRenderType(RenderState::DEFERRED);
 

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

@@ -84 +84 @@
   pix.pos.w = IN.projPos.w;
 
-  if (pix.col.w < 0.9f)
+  if (pix.col.w < 0.5f)
           discard;