Changeset 3290 for GTP

Timestamp:

01/22/09 18:45:22 (15 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• MainApp.vcproj (modified) (1 diff)
• default.env (modified) (3 diffs)
• src/VisibilitySolutionLoader.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (7 diffs)
• src/shaderenv.h (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/MainApp.vcproj

@@ -155 +155 @@
                                 IgnoreAllDefaultLibraries="false"
                                 IgnoreDefaultLibraryNames="LIBCMT"
-                                GenerateDebugInformation="false"
+                                GenerateDebugInformation="true"
                                 SubSystem="1"
                                 LargeAddressAware="2"

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
+filename=city
+bvhname=city
 useLODs=1
 # shadow map size
@@ -75 +75 @@
 
 # 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
@@ -152 +152 @@
 
 # static geometry
-filename=PowerPlantM
-bvhname=PowerPlantM
-keyForwardMotion=500.0f
-mouseMotion=10.0f
-visibilitySolution=power-plant-2c-xx-1000b-pgv2
+#filename=PowerPlantM
+#bvhname=PowerPlantM
+#keyForwardMotion=500.0f
+#mouseMotion=10.0f
+#visibilitySolution=power-plant-2c-xx-1000b-pgv2
 #visibilitySolution=power-plant-2c-xx-1000d-pgv
-visibilitySolution=power-plant-2c-xx-1000b-spgvu
-camPosition=-1320.57 -6306.34 3603
-camDirection=0.292156 0.9556 0.0383878
-viewCellsScaleFactor=0.05f
+#visibilitySolution=power-plant-2c-xx-1000b-spgvu
+#camPosition=-1320.57 -6306.34 3603
+#camDirection=0.292156 0.9556 0.0383878
+#viewCellsScaleFactor=0.05f
 
-camPosition=763.554 -10254.5 2604
-camDirection=-0.0975121 0.994494 0.0383878
-useSkylightForIllum=1
-skyDomeScaleFactor=1000.0f
+#camPosition=763.554 -10254.5 2604
+#camDirection=-0.0975121 0.994494 0.0383878
+#useSkylightForIllum=1
+#skyDomeScaleFactor=1000.0f
 
-camPosition=1145.31 413.602 186.678
-camDirection=-0.917729 -0.397207 -0
+#camPosition=1145.31 413.602 186.678
+#camDirection=-0.917729 -0.397207 -0
 #lightDirection=0.509293 0.784034 -0.35484
-lightDirection=0.360937 0.0267167 -0.932207
+#lightDirection=0.360937 0.0267167 -0.932207
 
 #walkThroughSuffix=path_pp
-walkThroughSuffix=walkthrough_pp_1
+#walkThroughSuffix=walkthrough_pp_1

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

@@ -156 +156 @@
 
         BvhNodeContainer nodes;
-        //CreateIdSortedList2(bvh->GetStaticRoot(), nodes);
-        CreateIdSortedList(bvh, nodes);
+        CreateIdSortedList2(bvh->GetStaticRoot(), nodes);
+        //CreateIdSortedList(bvh, nodes);
 
         const int tenpercent = number / 10;

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

@@ -616 +616 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
-        if (1) LoadPompeiiFloor();
-
-#if 0
+        if (0) LoadPompeiiFloor();
+
+#if 1
         const Vector3 sceneCenter(470.398f, 240.364f, 181.7f);
         //const Vector3 sceneCenter(470.398f, 240.364f, 180.3);
@@ -630 +630 @@
         for (int i = 0; i < 10; ++ i)
         {
+                cout << "here3" << endl;
                 SceneEntity *ent = new SceneEntity(*buddha);
                 resourceManager->AddSceneEntity(ent);
@@ -1119 +1120 @@
 void MainLoop() 
 {       
-        if (buddha)
+        if (0)//buddha)
         {
                 Matrix4x4 oldTrafo = buddha->GetTransform()->GetMatrix();
@@ -1141 +1142 @@
 #endif
 
-                /*
                 /////////////////////////
                 //-- update animations
@@ -1152 +1152 @@
 
                 motionPath->Move(0.01f);
-                */
         }
 
@@ -2394 +2393 @@
                         {                       
                                 sprintf(msg[7], "%s:  %6.1f fps", alg_str[renderMode], fps);            
-                                myfont.DrawString(msg[7], 1.3f, winWidth - 350, winHeight - 30.0f);
+                                myfont.DrawString(msg[7], 1.3f, winWidth - 300, winHeight - 10.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);           
+                                //myfont.DrawString(msg[7], 1.3f, winWidth - 300, winHeight - 60.0f);           
                         }
                 }
@@ -2404 +2403 @@
                 {
                         sprintf(msg[7], "%s:  %6.1f ms", alg_str[renderMode], rTime);
-                        myfont.DrawString(msg[7], 1.3f, winWidth - 350, winHeight - 30.0f);
+                        myfont.DrawString(msg[7], 1.3f, winWidth - 300, winHeight - 10.0f);
                 }
 

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

@@ -8 +8 @@
 //#define NUM_SAMPLES 8
 //#define NUM_SAMPLES 16
-#define NUM_SAMPLES 24
-//#define NUM_SAMPLES 48
+//#define NUM_SAMPLES 24
+#define NUM_SAMPLES 48
 
 #define MIN_SAMPLES 8
@@ -63 +63 @@
 
 
-//#define USE_GTX
+#define USE_GTX
 
 #endif // __SHADERENV_H