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

Timestamp:

01/12/09 19:03:24 (15 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• Bvh.cpp (modified) (3 diffs)
• CHCPlusPlusTraverser.cpp (modified) (1 diff)
• FrustumCullingTraverser.cpp (modified) (1 diff)
• ResourceManager.cpp (modified) (4 diffs)
• SceneEntityConverter.cpp (modified) (1 diff)
• SkyPreetham.cpp (modified) (1 diff)
• StopAndWaitTraverser.cpp (modified) (1 diff)
• VisibilitySolutionLoader.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (13 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/combineSsao.cg (modified) (1 diff)
• shaders/ssao.cg (modified) (1 diff)

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

@@ -652 +652 @@
         CollectNodes(mStaticRoot, nodes);
         //CollectNodes(mRoot, nodes);
+        // also add root
+        nodes.push_back(mRoot);
 
         cout << "creating new indices" << endl;
@@ -799 +801 @@
 
         CollectNodes(mDynamicRoot, nodes);
+        // also add root
+        nodes.push_back(mRoot);
 
         const unsigned int bufferSize = 8 * (int)nodes.size();
@@ -813 +817 @@
 
                 for (int j = 0; j < 8; ++ j)
+                {
                         (static_cast<Vector3 *>(mVertices))[node->GetId() * 8 + j] = node->GetBox().GetVertex(j);
+                }
         }
         

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

@@ -119 +119 @@
                         mDistanceQueue.pop();
         
-                        if (!IsNodeGeometryVisible(node, 10))
-                        {
+                        if (0 && !IsNodeGeometryVisible(node, 10))
+                        {
+                                // todo: find out why it is jumping
                                 node->SetLastVisitedFrame(mFrameId);
                                 node->SetVisible(false);

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

@@ -17 +17 @@
                 mDistanceQueue.pop();
         
-                if (1 && !IsNodeGeometryVisible(node, 10))
+                if (0 && !IsNodeGeometryVisible(node, 10))
                 {
                         node->SetVisible(false);

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

@@ -315 +315 @@
 
         deferred->GetFragmentProgramParameters()->SetViewMatrixParam(0);
-        
         deferred->GetVertexProgramParameters()->SetModelMatrixParam(1);
         deferred->GetVertexProgramParameters()->SetOldModelMatrixParam(2);
@@ -425 +424 @@
 
         cout << "loaded " << numTextures << " textures" << endl;
-
         cout << "loading shapes (geometry + materials)" << endl;
 
@@ -432 +430 @@
 
         cout << "loaded " << (int)mGeometryTable.size() << " shapes" << endl;
-
         cout << "loading scene entites" << endl;
         
@@ -438 +435 @@
         
         cout << "loaded " << numEntities << " scene entities" << endl;
-
         cout << "bin loading finished" << endl;
 

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

@@ -93 +93 @@
 
         tex[0].first = 0; tex[0].second = 0;
-        tex[1].first = 1; tex[1].second = 0;
-        tex[2].first = 1; tex[2].second = 1;
+        tex[1].first = 50; tex[1].second = 0;
+        tex[2].first = 50; tex[2].second = 50;
 
         tex[3].first = 0; tex[3].second = 0;
-        tex[4].first = 1; tex[4].second = 1;
-        tex[5].first = 0; tex[5].second = 1;
+        tex[4].first = 50; tex[4].second = 50;
+        tex[5].first = 0; tex[5].second = 50;
 
         for (size_t i = 0; i < triangles.size(); ++ i)

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

@@ -109 +109 @@
 
         // scale the sky dome so no intersection with the scene is visible
-        const float scaleFactor = 80.0f;
-        //const float scaleFactor = 500.0f;
+        //const float scaleFactor = 80.0f;
+        const float scaleFactor = 1000.0f;
 
         position.z -= 3.0f * scaleFactor;

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

@@ -22 +22 @@
                 mDistanceQueue.pop();
         
-                if (1 && !IsNodeGeometryVisible(node, 10))
+                if (0 && !IsNodeGeometryVisible(node, 10))
                 {
                         node->SetVisible(false);

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

@@ -136 +136 @@
         BvhNodeContainer nodes;
         CreateIdSortedList(bvh, nodes);
-
+        
         for (int i = 0; i < number; ++ i) 
         {
@@ -148 +148 @@
                         fread(&objectId, sizeof(int), 1, fw);
                         fread(&time, sizeof(float), 1, fw);
-
+        
                         BvhNode *node = nodes[objectId];
-
                         mViewCells[i]->mPvs.AddEntry(bvh, node);
                 }

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

@@ -132 +132 @@
 
 string filename("city");
+string bvhname("");
 string visibilitySolution("");
 
@@ -303 +304 @@
 
 GLuint sunQuery = 0;
+
+string walkThroughSuffix("frames");
 
 
@@ -455 +458 @@
 
                 env.GetStringParam(string("recordedFramesSuffix"), recordedFramesSuffix);
+                env.GetStringParam(string("walkThroughSuffix"), walkThroughSuffix);
                 env.GetStringParam(string("statsFilename"), statsFilename);
                 env.GetStringParam(string("filename"), filename);
+                env.GetStringParam(string("bvhname"), bvhname);
                 env.GetStringParam(string("visibilitySolution"), visibilitySolution);
 
@@ -472 +477 @@
                 cout << "max batch size: " << maxBatchSize << endl;
                 cout << "triangles per virtual leaf: " << trianglesPerVirtualLeaf << endl;
+
+                cout << "static scene filename prefix: " << filename << endl;
+                cout << "bvh filename prefix: " << bvhname << endl;
 
                 cout << "key forward motion: " << keyForwardMotion << endl;
@@ -491 +499 @@
                 cout << "use ssao full resolution: " << ssaoUseFullResolution << endl;
                 cout << "recorded frames suffix: " << recordedFramesSuffix << endl;
+                cout << "walkthrough suffix: " << walkThroughSuffix << endl;
                 cout << "stats filename: " << statsFilename << endl;
-                cout << "static scene filename prefix: " << filename << endl;
                 cout << "use PVSs: " << usePvs << endl;
                 cout << "visibility solution: " << visibilitySolution << endl;
@@ -587 +595 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
+#if 1
+
+        AxisAlignedBox3 pompeiiBox = SceneEntity::ComputeBoundingBox(staticObjects);
+
         // todo: dispose texture
         Texture *floorTex = new Texture(model_path + "stairs.c.01.tif");
@@ -594 +606 @@
 
         floorTex->Create();
-
-
         Material *mymat = resourceManager->CreateMaterial();
 
-        mymat->GetTechnique(0)->SetDiffuse(RgbaColor(1, 1, 1, 1));
-        mymat->GetTechnique(0)->SetTexture(floorTex);
-
-        const Vector3 offs(1300.0f, -2500.0f, .0f);
+        Technique *tech = mymat->GetDefaultTechnique();
+        tech->SetDiffuse(RgbaColor(1, 1, 1, 1));
+        tech->SetTexture(floorTex);
+
+        Technique *depthPass = new Technique(*tech);
+        Technique *deferred = new Technique(*tech);
+
+        depthPass->SetColorWriteEnabled(false);
+        depthPass->SetLightingEnabled(false);
+
+        ShaderProgram *defaultFragmentTexProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("defaultFragmentTexMrt");
+        ShaderProgram *defaultVertexProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("defaultVertexMrt");
+
+        deferred->SetFragmentProgram(defaultFragmentTexProgramMrt);
+        deferred->SetVertexProgram(defaultVertexProgramMrt);
+
+        deferred->GetFragmentProgramParameters()->SetViewMatrixParam(0);
+        deferred->GetVertexProgramParameters()->SetModelMatrixParam(1);
+        deferred->GetVertexProgramParameters()->SetOldModelMatrixParam(2);
+
+        deferred->SetTexture(floorTex);
+        
+        mymat->AddTechnique(deferred);
+        mymat->AddTechnique(depthPass);
+
+
+        //const Vector3 offs(1300.0f, -2500.0f, .0f);
+        const Vector3 offs(pompeiiBox.Center(0), pompeiiBox.Center(1), 0);
         Matrix4x4 moffs = TranslationMatrix(offs);
 
@@ -609 +643 @@
         SceneEntity *myplane = 
                 SceneEntityConverter().ConvertPlane(plane, 
-                                                    500, 
-                                                                                        500,
+                                                    pompeiiBox.Size(0),
+                                                                                        pompeiiBox.Size(1),
                                                                                         5, 
                                                                                         5,
@@ -618 +652 @@
         resourceManager->AddSceneEntity(myplane);
         staticObjects.push_back(myplane);
-        /*const float side = 400.0f;
-        AxisAlignedBox3 mybox(Vector3(-side, -side, -side), Vector3(side, side, side));
-
-        Transform3 *mytrafo2 = resourceManager->CreateTransform(moffs);
-
-        SceneEntity *myboxEnt = 
-                SceneEntityConverter().ConvertBox(mybox, mymat, mytrafo2);
-
-        staticObjects.push_back(myboxEnt);
-        resourceManager->AddSceneEntity(myboxEnt);*/
+
+#endif
 
 #if 0
@@ -667 +693 @@
         //-- load the associated static bvh
 
-        const string bvh_filename = string(model_path + filename + ".bvh");
-
         BvhFactory bvhFactory;
-#if 1
-        bvh = bvhFactory.Create(staticObjects, dynamicObjects, maxDepthForTestingChildren);
-#else
-        bvh = bvhFactory.Create(bvh_filename, staticObjects, dynamicObjects, maxDepthForTestingChildren);
-#endif
-
-        if (!bvh)
-        {
-                cerr << "loading bvh " << bvh_filename << " failed" << endl;
-                CleanUp();
-                exit(0);
+
+        if (bvhname != "")
+        {
+                cout << "loading bvh from disc" << endl;
+                const string bvh_fullpath = string(model_path + bvhname + ".bvh");
+                bvh = bvhFactory.Create(bvh_fullpath, staticObjects, dynamicObjects, maxDepthForTestingChildren);
+
+                if (!bvh)
+                {
+                        cerr << "loading bvh " << bvh_fullpath << " failed" << endl;
+                        CleanUp();
+                        exit(0);
+                }
+        }
+        else
+        {
+                cout << "creating new bvh" << endl;
+                bvh = bvhFactory.Create(staticObjects, dynamicObjects, maxDepthForTestingChildren);
         }
 
@@ -1198 +1229 @@
         {
                 if (!walkThroughPlayer)
-                        walkThroughPlayer = new WalkThroughPlayer("frames.log");
+                        walkThroughPlayer = new WalkThroughPlayer(walkThroughSuffix + ".log");
                 
                 ++ currentReplayFrame;
@@ -1229 +1260 @@
         {
                 if (!walkThroughRecorder)
-                        walkThroughRecorder = new WalkThroughRecorder("frames.log");
+                        walkThroughRecorder = new WalkThroughRecorder(walkThroughSuffix + ".log");
                 
                 if ((Distance(oldPos, camera->GetPosition()) > 1e-6f) ||
@@ -2560 +2591 @@
 {
         const string filename = string(model_path + model);
-
         int numEntities = 0;
 

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

@@ -6 +6 @@
 //-- ssao + gi parameters
 
-#define NUM_SAMPLES 8
+//#define NUM_SAMPLES 8
 //#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 24
-//#define NUM_SAMPLES 48
+#define NUM_SAMPLES 48
 
 #define MIN_SAMPLES 8

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

@@ -162 +162 @@
 
                 // the filtered ssao value
-                //ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, scale, bl, br, tl, tr);
+                ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, scale, bl, br, tl, tr);
         }
 

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

@@ -322 +322 @@
 #endif
 
-        return float3(total_ao, validSamples, numSamples);
+        //return float3(total_ao, validSamples, numSamples);
+        return float3(min(1.0f, total_ao), validSamples, numSamples);
 }