Changeset 2980 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

09/29/08 10:33:56 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (9 diffs)

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

@@ -40 +40 @@
 #include "SkyPreetham.h"
 #include "Texture.h"
+#include "EntityMerger.h"
 
 
@@ -58 +59 @@
 /// the renderable scene geometry
 SceneEntityContainer sceneEntities;
+SceneEntityContainer sceneEntities2;
 // traverses and renders the hierarchy
 RenderTraverser *traverser = NULL;
@@ -262 +264 @@
 
 
-
 /////////
 //-- cg stuff
@@ -449 +450 @@
         }
 
-        
-        
+        SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
+
+        int merged = 0;
+        
+        SceneEntity *oldEnt = NULL;
+
+        cout << "merging entities .. " << endl;
+
+        for (sit = sceneEntities.begin(); sit < sit_end; ++ sit)
+        {
+                SceneEntity *newEnt = (*sit);
+
+                if (!newEnt->GetTransform()->IsIdentity())
+                {
+                        sceneEntities2.push_back(newEnt);
+                        continue;
+                }
+
+                if (oldEnt)
+                {
+                        EntityMerger merger(newEnt, oldEnt);
+                        SceneEntity *ent = merger.Merge();
+
+                        sceneEntities2.push_back(ent);
+
+                        oldEnt = NULL;
+
+                        ++ merged;
+                }
+                else
+                {
+                        oldEnt = newEnt;
+                }
+        }
+
+        if (oldEnt && oldEnt->GetTransform()->IsIdentity())
+                sceneEntities2.push_back(oldEnt);
+
+        cout << "merged " << merged << " of " << (int)sceneEntities.size() << " entities " << endl;
+
         // set far plane based on scene extent
         farDist = 10.0f * Magnitude(bvh->GetBox().Diagonal());
@@ -611 +650 @@
 {
         PrintGLerror("fbo start");
+
         // this fbo basicly stores the scene information we get from standard rendering of a frame
         // we store colors, normals, positions (for the ssao)
@@ -1096 +1136 @@
         {
                 // actually render the scene geometry using the specified algorithm
-                traverser->RenderScene();
+                //traverser->RenderScene();
+
         /*
                 state.Reset();
                 aeroplane->Render(&state);
-
-        SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
+*/
+
+#if 0
+                SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
 
                 for (sit = sceneEntities.begin(); sit != sit_end; ++ sit)
-                {
                         renderQueue->Enqueue(*sit);
-                }
-
+#else
+
+                SceneEntityContainer::const_iterator sit, sit_end = sceneEntities2.end();
+
+                for (sit = sceneEntities2.begin(); sit != sit_end; ++ sit)
+                        renderQueue->Enqueue(*sit);
+#endif
                 renderQueue->Apply();
-                */
         }
 
@@ -1115 +1161 @@
         /////////
         //-- do the rest of the rendering
-
         
         // reset depth pass and render visible objects
@@ -1772 +1817 @@
         DEL_PTR(fbo);
         DEL_PTR(ssaoShader);
+
+        CLEAR_CONTAINER(sceneEntities2);
 
         if (sCgMrtVertexProgram)
@@ -2085 +2132 @@
         state.SetUseAlphaToCoverage(false);
 
-        // change CHC++ set of state variables (must be done for each change of camera because
+        // change CHC++ set of state variables 
+        // this must be done for each change of camera because
         // otherwise the temporal coherency is broken
         BvhNode::SetCurrentState(1);