Changeset 3077 for GTP/trunk

Timestamp:

10/29/08 01:08:56 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• SkyPreetham.cpp (modified) (3 diffs)
• chcdemo.cpp (modified) (2 diffs)

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

@@ -292 +292 @@
         // downscale ambient color
         if (scaleToRange)
-                ambient *= 2e-5f;
+                ambient *= 5e-6f;
         else
                 ambient *= 1e-1f;
@@ -298 +298 @@
         // simulate the sun intensity by modulating the ambient term.
         ambient *= (10.0f - 9.0f * DotProd(sunDir, Vector3::UNIT_Z()));
-        //ambient += Vector3(0.2f);
+
 
         Vector3 num;
@@ -330 +330 @@
         color.z =  0.055648f * XYZ.x - 0.204043f * XYZ.y + 1.057311f * XYZ.z;
 
-        // Calculate final sun diffuse color.
+        // calculate final sun diffuse color.
         if (scaleToRange)
-                diffuse = color * 5e-2f;
+                diffuse = color * 1e-5f;
         else
                 diffuse = color * 3e-1f;

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

@@ -773 +773 @@
 
         // no tone mapping => scale
-        if (!useToneMapping)
-        {
-                const float maxComponent = sunDiffuse.MaxComponent();
+        if (0)//!useToneMapping)
+        {
+                float maxComponent = sunDiffuse.MaxComponent();
                 sunDiffuse /= maxComponent;
         }
@@ -782 +782 @@
         diffuse[1] = sunDiffuse.y;
         diffuse[2] = sunDiffuse.z;
+
+        //cout << sunDiffuse << " " << sunAmbient << endl;
 
         glLightfv(GL_LIGHT0, GL_AMBIENT, ambient);