Changeset 3295 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

02/06/09 17:34:25 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• BvhConstructor.cpp (modified) (1 diff)
• SkyPreetham.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (6 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/globillum.cg (modified) (1 diff)

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

@@ -110 +110 @@
         int bestAxis = 0;
 
-        //  cout<<"Evaluating axis..."<<endl<<flush;
-
         const int initialPlanes = 3;
 

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

@@ -294 +294 @@
         // downscale ambient color
         if (scaleToRange)
+        {
                 ambient *= 8e-6f;
+        }
         else
         {
@@ -342 +344 @@
         // calculate final sun diffuse color.
         if (scaleToRange)
+        {
                 diffuse = color * 3e-5f;
+        }
         else
+        {
                 diffuse = color * 3e-1f;
+        }
 
         // diffuse component should be more saturated (and less blueish) for high sun positions

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

@@ -160 +160 @@
 int visibilitySolutionInitialState = 0;
 
+Vector3 defaultAmbient(0.2f);
+Vector3 defaultDiffuse(1.0f);
+
 
 /// the technique used for rendering
@@ -462 +465 @@
                 env.GetVectorParam(string("camDirection"), camDir);
                 env.GetVectorParam(string("lightDirection"), lightDir);
+                env.GetVectorParam(string("defaultAmbient"), defaultAmbient);
+                env.GetVectorParam(string("defaultDiffuse"), defaultDiffuse);
 
                 env.GetBoolParam(string("useFullScreen"), useFullScreen);
@@ -617 +622 @@
         //LoadModel("toyplane2.dem", dynamicObjects);
         //LoadModel("elephal.dem", dynamicObjects);
-        //LoadModel("sibenik.dem", dynamicObjects);
 
         if (0) LoadPompeiiFloor();
@@ -971 +975 @@
 }
 
-/** Setup sunlight
+/** Setup lighting conditions
 */
 void SetupLighting()
@@ -1011 +1015 @@
         else
         {
-
-                ambient[0] = .2f;
-                ambient[1] = .2f;
-                ambient[2] = .2f;
-
-                diffuse[0] = 1.0f;
-                diffuse[1] = 1.0f;
-                diffuse[2] = 1.0f;
+                ambient[0] = defaultAmbient.x;
+                ambient[1] = defaultAmbient.y;
+                ambient[2] = defaultAmbient.z;
+
+                diffuse[0] = defaultDiffuse.x;
+                diffuse[1] = defaultDiffuse.y;
+                diffuse[2] = defaultDiffuse.z;
         }
 
@@ -1296 +1299 @@
 
                 if (showShadowMap && !renderLightView)
+                {
                         RenderShadowMap(camera->GetFar());
+                }
 
                 //glPushAttrib(GL_VIEWPORT_BIT);

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

@@ -62 +62 @@
 #define NUM_DOF_TABS 16
 
-
 #define USE_GTX
 

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

@@ -191 +191 @@
         //-- compute color bleeding + ao
 
-        GiStruct gi = globIllum(IN, colors, noiseTex, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(IN.view), sampleIntensity);
+        GiStruct gi = globIllum(IN, colors, noiseTex, samples, normal, eyeSpacePos, 
+                                    w, bl, br, tl, tr, normalize(IN.view), sampleIntensity);