Changeset 3044

Timestamp:

10/19/08 13:42:41 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• chcdemo.cpp (modified) (8 diffs)
• shaders/treeanimation.cg (modified) (1 diff)

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

@@ -886 +886 @@
         // hack
         int oldRenderMethod = renderMethod;
-
+        // for rendering the light view, we use forward rendering
         if (renderLightView)
                 renderMethod = RenderState::FORWARD;
@@ -903 +903 @@
                 glEnable(GL_LIGHTING);
 
-                loader->DisableFragmentProfile();
-                loader->DisableVertexProfile();
-
                 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
@@ -922 +919 @@
 
                 glDrawBuffers(1, mrt);
-
-                loader->DisableFragmentProfile();
-                loader->DisableVertexProfile();
 
                 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -940 +934 @@
                 glEnable(GL_MULTISAMPLE_ARB);
                 
-                loader->DisableFragmentProfile();
-                loader->DisableVertexProfile();
-
                 state.SetRenderPassType(RenderState::DEPTH_PASS);
 
@@ -1024 +1015 @@
                 FrameBufferObject::Release();
 
-                loader->DisableVertexProfile();
-                loader->DisableFragmentProfile();
+                //loader->DisableVertexProfile();
+                //loader->DisableFragmentProfile();
 
                 if (!ssaoShader) ssaoShader = 
@@ -1866 +1857 @@
 void RenderSky()
 {
-        loader->EnableVertexProfile();
-        loader->EnableFragmentProfile();
+        //loader->EnableVertexProfile();
+        //loader->EnableFragmentProfile();
 
         if ((renderMethod == RENDER_DEFERRED) || (renderMethod == RENDER_DEPTH_PASS_DEFERRED))
@@ -1878 +1869 @@
         preetham->RenderSkyDome(-light->GetDirection(), camera, &state, !useToneMapping);
 
-        loader->DisableVertexProfile();
-        loader->DisableFragmentProfile();
+        state.Reset();
 }
 
@@ -1890 +1880 @@
                 if (showShadowMap && !renderLightView)
                 {
+                        state.Reset();
+
                         float minVisibleDist = min(camera->GetFar(), traverser->GetMaxVisibleDistance());
                         RenderShadowMap(minVisibleDist);

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

@@ -43 +43 @@
         const float pos = (minMaxPos.x - IN.position.z) / (minMaxPos.x - minMaxPos.y);
 
-        float factor = pos * windStrength * sin(timer * frequency);
+        float factor = pos * pos * windStrength * sin(timer * frequency);
 
         // transform the vertex position into post projection space