Changeset 2983 for GTP/trunk/App/Demos

Timestamp:

10/01/08 00:51:12 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• SkyPreetham.cpp (modified) (3 diffs)
• SkyPreetham.h (modified) (1 diff)
• chcdemo.cpp (modified) (2 diffs)

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

@@ -101 +101 @@
 
 
-void SkyPreetham::RenderSkyDome(const Vector3 &sunDir, Camera *camera, RenderState *state)
+void SkyPreetham::RenderSkyDome(const Vector3 &sunDir, 
+                                                                Camera *camera, 
+                                                                RenderState *state, 
+                                                                bool scaleToRange)
 {
         pair<float, float> sun_theta;
@@ -134 +137 @@
                 cgGLEnableProfile(RenderState::sCgFragmentProfile);
                 cgGLBindProgram(sCgMrtFragmentSkyDomeProgram);
-                
-                // can use tone mapping
+
+        }
+
+        if (!scaleToRange)
+        {       
+                // use tone mapping
                 cgGLSetParameter1f(sMultiplierParam, 1.0f);
-        }       
-        else 
+        }
+        else
         {
                 // no tone mapping => scale
@@ -266 +273 @@
 
 
-void SkyPreetham::ComputeSunColor(const Vector3 &sunDir, Vector3 &ambient, Vector3 &diffuse, bool scaleToRange) const
+void SkyPreetham::ComputeSunColor(const Vector3 &sunDir, 
+                                                                  Vector3 &ambient, 
+                                                                  Vector3 &diffuse,
+                                                                  bool scaleToRange) const
 {
         // sunDir is sun direction

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

@@ -22 +22 @@
         virtual ~SkyPreetham();
 
-        void RenderSkyDome(const CHCDemoEngine::Vector3 &sunDir, CHCDemoEngine::Camera *camera, CHCDemoEngine::RenderState *state);
+        void RenderSkyDome(const CHCDemoEngine::Vector3 &sunDir, CHCDemoEngine::Camera *camera, CHCDemoEngine::RenderState *state, bool scaleToRange);
 
         static void Init(CGcontext context);

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

@@ -838 +838 @@
         
 
-        const bool useToneMapping = 
-                (renderMethod == RENDER_DEPTH_PASS_DEFERRED) ||
-                (renderMethod == RENDER_DEFERRED);
+        //const bool useToneMapping = (renderMethod == RENDER_DEPTH_PASS_DEFERRED) || (renderMethod == RENDER_DEFERRED);
+        const bool useToneMapping = false;
 
         Vector3 sunAmbient;
@@ -2022 +2021 @@
                 state.SetRenderPassType(RenderState::DEFERRED);
 
-        preetham->RenderSkyDome(-light->GetDirection(), camera, &state);
+        //const bool useToneMapping = (renderMethod == RENDER_DEPTH_PASS_DEFERRED) || (renderMethod == RENDER_DEFERRED);
+        const bool useToneMapping = false;
+
+        preetham->RenderSkyDome(-light->GetDirection(), camera, &state, !useToneMapping);
 
         cgGLDisableProfile(RenderState::sCgVertexProfile);