Changeset 3288 for GTP

Timestamp:

01/20/09 10:38:08 (15 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (3 diffs)
• src/SkyPreetham.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -13 +13 @@
 #filename=mypompeii
 #bvhname=mypompeii
-#filename=pompeii/pompeii_full
+filename=pompeii/pompeii_full
 #filename=pompeii/pompeii_part
-filename=city
-bvhname=city
-useLODs=0
+#filename=city
+#bvhname=city
+useLODs=1
 # shadow map size
 shadowSize=4096
@@ -76 +76 @@
 
 # initial camera position
-camPosition=483.398f 242.364f 186.078f
+#camPosition=483.398f 242.364f 186.078f
 # pompeii view point
-#camPosition=1300.0f -2500.0f 10.0f
+camPosition=1300.0f -2500.0f 10.0f
 # pompeii problematic
 #camPosition=627.003 -1725.33 25.2
@@ -170 +170 @@
 
 
-camPosition=1145.31 413.602 186.678
-camDirection=-0.917729 -0.397207 -0
-lightDirection=0.509293 0.784034 -0.35484
+#camPosition=1145.31 413.602 186.678
+#camDirection=-0.917729 -0.397207 -0
+#lightDirection=0.509293 0.784034 -0.35484

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

@@ -296 +296 @@
                 ambient *= 1e-1f;
 
-        //  could be too blueish ...
+        //  slightly too blueish => scale
         ambient.x *= 1.3f;
-        ambient.y *= 1.2f;
+        ambient.y *= 1.1f;
         ambient.z = max(max(ambient.z, ambient.x), ambient.y);
 

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

@@ -616 +616 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
-        if (0) LoadPompeiiFloor();
+        if (1) LoadPompeiiFloor();
 
 #if 0
@@ -2399 +2399 @@
                                 sprintf(msg[7], "%s:  %6.1f fps", alg_str[renderMode], fps);            
                                 myfont.DrawString(msg[7], 1.3f, winWidth - 350, winHeight - 30.0f);
+
+                                //int mrays = (int)shotRays / 1000000;
+                                //sprintf(msg[7], "%s:  %04d M rays", alg_str[renderMode], mrays);      
+                                //myfont.DrawString(msg[7], 1.3f, winWidth - 350, winHeight - 60.0f);           
                         }
-
-                        int mrays = (int)shotRays / 1000000;
-                        sprintf(msg[7], "%s:  %04d M rays", alg_str[renderMode], mrays);        
-                        myfont.DrawString(msg[7], 1.3f, winWidth - 350, winHeight - 60.0f);
                 }
                 else