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

Timestamp:

09/23/08 18:02:33 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -272 +272 @@
         ComputeFactors(sunDir, zenithColor, ABCDE, sun_theta);
 
-        ambient = zenithColor;
-
         Vector3 zenith_XYZ;                                                                                             
 
-        zenith_XYZ.x = (ambient.x / ambient.y) * ambient.z;                                                                        
-        zenith_XYZ.y = ambient.z;                                                                                          
-        zenith_XYZ.z = ((1.0f - ambient.x - ambient.y) / ambient.y) * ambient.z;                                                                
+        zenith_XYZ.x = (zenithColor.x / zenithColor.y) * zenithColor.z;                                                                        
+        zenith_XYZ.y = zenithColor.z;                                                                                          
+        zenith_XYZ.z = ((1.0f - zenithColor.x - zenithColor.y) / zenithColor.y) * zenithColor.z;                                                                
 
         ambient.x =  3.240479f * zenith_XYZ.x - 1.537150f * zenith_XYZ.y - 0.498535f * zenith_XYZ.z;
@@ -285 +283 @@
 
         // downscale ambient color
-        ambient *= 5e-5f;
+        //ambient *= 5e-5f;
+        ambient *= 2e-5f;
 
         // simulate the sun intensity by modulating the ambient term.
-        ambient *= (1.0f - 0.9f * DotProd(sunDir, Vector3::UNIT_Z()));
+        //ambient *= (1.0f - 0.9f * DotProd(sunDir, Vector3::UNIT_Z()));
         ambient += Vector3(0.2f);
 
@@ -304 +303 @@
 
 
-        Vector3 xyY = (num / den) * zenithColor;    
+        Vector3 xyY = zenithColor * num / den;    
 
         Vector3 XYZ;                                                                                             
@@ -312 +311 @@
         XYZ.z = ((1.0f - xyY.x - xyY.y) / xyY.y) * xyY.z;                                                                
 
+
+        /////////////
+        //-- transform to rgb
 
         Vector3 color;  
@@ -319 +321 @@
 
         // Calculate final sun diffuse color.
-        diffuse = color * 0.00017f;
-}
+        diffuse = color * 1.7e-4f;
+        //diffuse = color;
+
+        cout << "diffuse: " << Magnitude(diffuse) << " ambient: " << Magnitude(ambient) << endl;
+}