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

Timestamp:

01/14/09 18:48:14 (15 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• Geometry.cpp (modified) (1 diff)
• SkyPreetham.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (10 diffs)

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

@@ -40 +40 @@
         if (delData)
         {
-                //DEL_ARRAY_PTR(mVertices);
+                DEL_ARRAY_PTR(mVertices);
                 DEL_ARRAY_PTR(mNormals);
                 DEL_ARRAY_PTR(mTexCoords);

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 = 1000.0f;
+        //const float scaleFactor = 80.0f;
+        const float scaleFactor = 1000.0f;
 
         position.z -= 3.0f * scaleFactor;

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

@@ -377 +377 @@
 void RenderViewCell();
 
+void LoadPompeiiScene();
+
 
 // new view projection matrix of the camera
@@ -597 +599 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
-
-        AxisAlignedBox3 pompeiiBox = SceneEntity::ComputeBoundingBox(staticObjects);
-
-#if 1
-        // todo: dispose texture
-        Texture *floorTex = new Texture(model_path + "stairs.c.01.tif");
-
-        floorTex->SetBoundaryModeS(Texture::REPEAT);
-        floorTex->SetBoundaryModeT(Texture::REPEAT);
-
-        floorTex->Create();
-        Material *mymat = resourceManager->CreateMaterial();
-
-        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);
-
-        Plane3 plane;
-        Transform3 *mytrafo = resourceManager->CreateTransform(moffs);
-
-        SceneEntity *myplane = 
-                SceneEntityConverter().ConvertPlane(plane, 
-                                                    pompeiiBox.Size(0),
-                                                                                        pompeiiBox.Size(1),
-                                                                                        5, 
-                                                                                        5,
-                                                                                        mymat, 
-                                                                                        mytrafo);
-
-        resourceManager->AddSceneEntity(myplane);
-        staticObjects.push_back(myplane);
-
-#endif
+        if (1) LoadPompeiiScene();
 
 #if 0
@@ -724 +668 @@
 
 
-        ObjExporter().Export(model_path + "mypompeii.obj", bvh);
-        BvhExporter().Export(model_path + "mypompeii.bv", bvh);
+        //ObjExporter().Export(model_path + "mypompeii.obj", bvh);
+        //BvhExporter().Export(model_path + "mypompeii.bv", bvh);
 
 
@@ -1461 +1405 @@
                         deferredShader->SetSaveFrame("", -1);           
                 }
-                //if (makeSnapShot) makeSnapShot = false;
+                
+                if (makeSnapShot) makeSnapShot = false;
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;
@@ -2397 +2342 @@
                         int i = 4;
 
-                        if (0)
+                        if (0) // q: show rendered objects or nodes (no space for both)
                         {
                                 sprintf(msg[i ++], "rendered: %s of %s objects, %s of %s triangles", 
@@ -2408 +2353 @@
                         }
 
-                        sprintf(msg[i ++], "traversed: %5d, frustum culled: %5d, query culled: %5d",
+                        sprintf(msg[i ++], "traversed: %5d, frustum culled: %5d, query culled: %5d nodes",
                                 traversedNodes, frustumCulledNodes, queryCulledNodes);
                         sprintf(msg[i ++], "issued queries: %5d, state changes: %5d, render batches: %5d", 
@@ -2429 +2374 @@
                 {
                         if (showFPS)
-                                sprintf(msg[7], "%s:  %6.1f fps", alg_str[renderMode], fps);
+                        {                       
+                                sprintf(msg[7], "%s:  %6.1f fps", alg_str[renderMode], fps);            
+                                myfont.DrawString(msg[7], 1.3f, 690.0f, 760.0f);//, top_color, bottom_color);
+                        }
                 }
                 else
+                {
                         sprintf(msg[7], "%s:  %6.1f ms", alg_str[renderMode], rTime);
-                
-                myfont.DrawString(msg[7], 1.3f, 690.0f, 760.0f);//, top_color, bottom_color);
+                        myfont.DrawString(msg[7], 1.3f, 690.0f, 760.0f);//, top_color, bottom_color);
+                }
+
                 
                 //sprintf(msg[8], "algorithm time: %6.1f ms", rTime);
@@ -2516 +2466 @@
         renderState.Reset();
 
-        PrintGLerror("visibleobjects");
+        PrintGLerror("visible objects");
 }
 
@@ -2537 +2487 @@
 
         if (validIntersect) 
-                // && ((playerPos.z - oldPos.z) < bvh->GetBox().Size(2) * 1e-1f))
+                //&& ((playerPos.z - oldPos.z) < bvh->GetBox().Size(2) * 1e-1f))
         {
                 camera->SetPosition(playerPos);
@@ -2743 +2693 @@
         Visualization::RenderBoxForViz(viewCell->GetBox());
 }
+
+
+void LoadPompeiiScene()
+{
+        AxisAlignedBox3 pompeiiBox = SceneEntity::ComputeBoundingBox(staticObjects);
+
+        // todo: dispose texture
+        Texture *floorTex = new Texture(model_path + "stairs.c.01.tif");
+
+        floorTex->SetBoundaryModeS(Texture::REPEAT);
+        floorTex->SetBoundaryModeT(Texture::REPEAT);
+
+        floorTex->Create();
+        Material *mymat = resourceManager->CreateMaterial();
+
+        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);
+
+        Plane3 plane;
+        Transform3 *mytrafo = resourceManager->CreateTransform(moffs);
+
+        SceneEntity *myplane = 
+                SceneEntityConverter().ConvertPlane(plane, 
+                                                    pompeiiBox.Size(0),
+                                                                                        pompeiiBox.Size(1),
+                                                                                        5, 
+                                                                                        5,
+                                                                                        mymat, 
+                                                                                        mytrafo);
+
+        resourceManager->AddSceneEntity(myplane);
+        staticObjects.push_back(myplane);
+}