Changeset 3291

Timestamp:

01/23/09 18:33:15 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• MainApp.vcproj (modified) (1 diff)
• default.env (modified) (2 diffs)
• src/Bvh.cpp (modified) (6 diffs)
• src/SkyPreetham.cpp (modified) (2 diffs)
• src/chcdemo.cpp (modified) (4 diffs)
• src/shaders/ssao.cg (modified) (1 diff)

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

@@ -155 +155 @@
                                 IgnoreAllDefaultLibraries="false"
                                 IgnoreDefaultLibraryNames="LIBCMT"
-                                GenerateDebugInformation="true"
+                                GenerateDebugInformation="false"
                                 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

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

@@ -675 +675 @@
         // collect bvh nodes
         BvhNodeContainer nodes;
+        // also add root
+        nodes.push_back(mRoot);
         // first collect dynamic nodes so we make sure that they are in the beginning
         CollectNodes(mDynamicRoot, nodes);
@@ -680 +682 @@
         CollectNodes(mStaticRoot, nodes);
         //CollectNodes(mRoot, nodes);
-        // also add root
-        nodes.push_back(mRoot);
+        
 
         cout << "creating new indices" << endl;
@@ -748 +749 @@
         // collect all nodes
         BvhNodeContainer nodes;
+        // also add root
+        nodes.push_back(mRoot);
         //CollectNodes(mRoot, nodes);
         // first collect dynamic nodes so we make sure that they are in the beginning
@@ -753 +756 @@
         // then collect static nodes
         CollectNodes(mStaticRoot, nodes);
-        // also add root
-        nodes.push_back(mRoot);
 
         // assign ids to all nodes of the hierarchy
@@ -773 +774 @@
 
         nodes.reserve(GetNumNodes());
+        // also add root
+        nodes.push_back(mRoot);
         // first collect dynamic nodes so we make sure that they are in the beginning
         CollectNodes(mDynamicRoot, nodes);
         // then collect static nodes
         CollectNodes(mStaticRoot, nodes);
-        // also add root
-        nodes.push_back(mRoot);
 
         const unsigned int bufferSize = 8 * (int)nodes.size();
@@ -828 +829 @@
         nodes.clear();
 
-        CollectNodes(mDynamicRoot, nodes);
         // also add root
         nodes.push_back(mRoot);
+        
+        CollectNodes(mDynamicRoot, nodes);
+
 
         const unsigned int bufferSize = 8 * (int)nodes.size();

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

@@ -61 +61 @@
         }
         else
+        {
                 cerr << "sky program failed to load" << endl;
+        }
 
         mSkyFragProgram = 
@@ -294 +296 @@
                 ambient *= 8e-6f;
         else
+        {
                 ambient *= 1e-1f;
 
-        //  slightly too blueish => scale
-        ambient.x *= 1.3f;
-        ambient.y *= 1.1f;
-        ambient.z = max(max(ambient.z, ambient.x), ambient.y);
+                //  slightly too blueish with tone mapping => scale
+                ambient.x *= 1.3f;
+                ambient.y *= 1.1f;
+                ambient.z = max(max(ambient.z, ambient.x), ambient.y);
+        }
+        
 
         // simulate the sun intensity by modulating the ambient term.

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

@@ -616 +616 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
-        if (0) LoadPompeiiFloor();
-
-#if 1
+        if (1) LoadPompeiiFloor();
+
+#if 0
         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);
@@ -1120 +1119 @@
 void MainLoop() 
 {       
-        if (0)//buddha)
+        if (buddha)
         {
                 Matrix4x4 oldTrafo = buddha->GetTransform()->GetMatrix();
@@ -1146 +1145 @@
 
                 //const float rotAngle = M_PI * 1e-3f;
-                const float rotAngle = 1.0f * M_PI / 180.0f;
+                const float rotAngle = 0.3f * M_PI / 180.0f;
 
                 Matrix4x4 rotMatrix = RotationZMatrix(rotAngle);
-                dynamicObjects[2]->GetTransform()->MultMatrix(rotMatrix);
-
-                motionPath->Move(0.01f);
+                dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
+
+                motionPath->Move(0.005f);
         }
 

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

@@ -246 +246 @@
                 //-- (affects performance for some reason!)
 
-                if (1)//convergence < 700)
+                if (convergence < 700)
                 {
                         float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;