Changeset 2982 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SkyPreetham.cpp

Timestamp:

10/01/08 00:40:59 (16 years ago)

Author:

mattausch

Message:

problematic: merging

File:

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

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

@@ -24 +24 @@
 static CGparameter sDColorParam;
 static CGparameter sEColorParam;
+static CGparameter sMultiplierParam;
+
 
 
@@ -60 +62 @@
                 sDColorParam = cgGetNamedParameter(sCgSkyProgram, "dColor");
                 sEColorParam = cgGetNamedParameter(sCgSkyProgram, "eColor");
+
+                sMultiplierParam = cgGetNamedParameter(sCgSkyProgram, "multiplier");
         }
         else
@@ -75 +79 @@
         {
                 cgGLLoadProgram(sCgMrtFragmentSkyDomeProgram);
-
-                /*
-                cgGLSetParameter1f(sMaxDepthParam, MAX_DEPTH_CONST / farDist);
-                */
+                //cgGLSetParameter1f(sMaxDepthParam, MAX_DEPTH_CONST / farDist);
         }
         else
@@ -129 +130 @@
         cgGLSetParameter3f(sEColorParam, ABCDE[4].x, ABCDE[4].y, ABCDE[4].z);
 
-        cgGLEnableProfile(RenderState::sCgVertexProfile);
-        cgGLBindProgram(sCgSkyProgram);
-
-        
         if (state->GetRenderPassType() == RenderState::DEFERRED)
         {
                 cgGLEnableProfile(RenderState::sCgFragmentProfile);
                 cgGLBindProgram(sCgMrtFragmentSkyDomeProgram);
+                
+                // can use tone mapping
+                cgGLSetParameter1f(sMultiplierParam, 1.0f);
         }       
+        else 
+        {
+                // no tone mapping => scale
+                cgGLSetParameter1f(sMultiplierParam, 8e-5f);
+        }
+
+        cgGLEnableProfile(RenderState::sCgVertexProfile);
+        cgGLBindProgram(sCgSkyProgram);
 
         // Render sky dome.
@@ -258 +266 @@
 
 
-void SkyPreetham::ComputeSunColor(const Vector3 &sunDir, Vector3 &ambient, Vector3 &diffuse) const
+void SkyPreetham::ComputeSunColor(const Vector3 &sunDir, Vector3 &ambient, Vector3 &diffuse, bool scaleToRange) const
 {
         // sunDir is sun direction
@@ -280 +288 @@
 
         // downscale ambient color
-        if (1)
-                ambient *= 5e-5f;
+        if (scaleToRange)
+                ambient *= 2e-5f;
         else
                 ambient *= 1e-1f;
@@ -320 +328 @@
 
         // Calculate final sun diffuse color.
-        if (1)
-                diffuse = color * 1.7e-4f;
+        if (scaleToRange)
+                diffuse = color * 5e-2f;
         else
                 diffuse = color * 3e-1f;
 
         diffuse *= (2.0f - 1.0f * DotProd(sunDir, Vector3::UNIT_Z()));
-        
 
         //cout << "diffuse: " << Magnitude(diffuse) << " ambient: " << Magnitude(ambient) << endl;