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

Timestamp:

10/19/08 02:07:36 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -112 +112 @@
 enum RenderMethod
 {
-        RENDER_FIXED,
+        RENDER_FORWARD,
         RENDER_DEPTH_PASS,
         RENDER_DEFERRED,
@@ -120 +120 @@
 
 /// one of four possible render methods
-int renderMethod = RENDER_FIXED;
+int renderMethod = RENDER_FORWARD;
 
 
@@ -485 +485 @@
         visualization = new Visualization(bvh, camera, NULL, &state);
         
-        state.SetRenderPassType(RenderState::FIXED);
+        state.SetRenderPassType(RenderState::FORWARD);
 
         // frame time is restarted every frame
         frameTimer.Start();
-
         // the rendering loop
         glutMainLoop();
-
         // clean up
         CleanUp();
@@ -870 +868 @@
         }
         
+        GPUProgramParameters::InitFrame();
 
 
@@ -889 +888 @@
 
         if (renderLightView)
-                renderMethod = RenderState::FIXED;
+                renderMethod = RenderState::FORWARD;
 
         glEnableClientState(GL_VERTEX_ARRAY);
@@ -897 +896 @@
         switch (renderMethod)
         {
-        case RENDER_FIXED:
+        case RENDER_FORWARD:
         
                 glEnable(GL_MULTISAMPLE_ARB);
                 
-                state.SetRenderPassType(RenderState::FIXED);
+                state.SetRenderPassType(RenderState::FORWARD);
                 glEnable(GL_LIGHTING);
 
@@ -1053 +1052 @@
 
 
-        state.SetRenderPassType(RenderState::FIXED);
+        state.SetRenderPassType(RenderState::FORWARD);
         state.Reset();
 
@@ -1904 +1903 @@
         {
                 glEnable(GL_LIGHTING);
-                state.SetRenderPassType(RenderState::FIXED);
+                state.SetRenderPassType(RenderState::FORWARD);
                 state.Reset();
         }