Changeset 2980 for GTP/trunk

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• src/EntityMerger.cpp (added)
• src/EntityMerger.h (added)
• src/Geometry.cpp (modified) (2 diffs)
• src/Geometry.h (modified) (3 diffs)
• src/ResourceManager.cpp (modified) (3 diffs)
• src/SceneEntity.h (modified) (1 diff)
• src/chcdemo.cpp (modified) (9 diffs)
• src/common.h (modified) (3 diffs)

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

@@ -609 +609 @@
                                 </File>
                                 <File
+                                        RelativePath=".\src\EntityMerger.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath=".\src\EntityMerger.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\src\FrameBufferObject.cpp"
                                         >

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

@@ -10 +10 @@
 Geometry::Geometry(Vector3 *vertices, 
                                    Vector3 *normals,
-                                   float *texcoords,
+                                   Texcoord2 *texcoords,
                                    int numVertices,
                                    bool delData):
@@ -62 +62 @@
         if (mTexCoords)
         {
-                for (int i = 0; i < mNumVertices * 2; ++ i)
-                        data[mNumVertices * 6 + i] = mTexCoords[i];
+                for (int i = 0; i < mNumVertices; ++ i)
+                        ((Texcoord2 *)data)[mNumVertices * 3 + i] = mTexCoords[i];
         }
 

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

@@ -12 +12 @@
 class RenderState;
 
-/** Represents drawable geometry consisting of triangles
+
+/** Represents drawable geometry consisting of triangles.
 */
 class Geometry
 {
-friend class ResourceManager;
+        friend class ResourceManager;
+        friend class EntityMerger;
 
 public:
@@ -27 +29 @@
         Geometry(Vector3 *vertices, 
                      Vector3 *normals, 
-                         float *texcoords, 
+                         Texcoord2 *texcoords, 
                          int numVertices, 
                          bool delData);
@@ -56 +58 @@
         Vector3 *mNormals;
 
-        float *mTexCoords;
+        Texcoord2 *mTexCoords;
 
         unsigned int mVboId;

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

@@ -192 +192 @@
         Vector3 *vertices;
         Vector3 *normals;
-        float *texcoords;
+        Texcoord2 *texcoords;
 
 
@@ -217 +217 @@
         if (texCoordCount)
         {
-                texcoords = new float[texCoordCount * 2];
-                str.read(reinterpret_cast<char *>(texcoords), sizeof(float) * texCoordCount * 2);
+                texcoords = new Texcoord2[texCoordCount];
+                str.read(reinterpret_cast<char *>(texcoords), sizeof(Texcoord2) * texCoordCount);
         }
         else
@@ -224 +224 @@
                 texcoords = NULL;
         }
-        
-
-        return new Geometry(vertices, normals, texcoords, vertexCount, true);
+
+        // return new Geometry(vertices, normals, texcoords, vertexCount, true);
+        return new Geometry(vertices, normals, texcoords, vertexCount, false);
 }
 

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

@@ -27 +27 @@
 {
         friend class RenderQueue;
+        friend class EntityMerger;
 
 public:

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);

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

@@ -31 +31 @@
 class Polygon3;
 class Vector3;
-
+class Geometry;
 
 
@@ -492 +492 @@
 
 typedef std::vector<Shape *> ShapeContainer;
+typedef std::vector<Geometry *> GeometryContainer;
 typedef std::vector<LODLevel *> LODLevelContainer;
 typedef std::vector<Polygon3 *> PolygonContainer;
@@ -497 +498 @@
 typedef std::vector<Vector3> VertexArray;
 
+typedef std::pair<float, float> Texcoord2;
+
 
 static std::ofstream Debug("debug.log");