Changeset 2839 for GTP

Timestamp:

07/16/08 10:46:32 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (4 diffs)
• src/Bvh.cpp (modified) (1 diff)
• src/Halton.cpp (added)
• src/Halton.h (added)
• src/LODInfo.h (added)
• src/RenderQueue.cpp (modified) (4 diffs)
• src/RenderQueue.h (modified) (2 diffs)
• src/RenderTraverser.cpp (modified) (1 diff)
• src/ResourceManager.cpp (modified) (1 diff)
• src/SceneEntity.cpp (modified) (4 diffs)
• src/SceneEntity.h (modified) (4 diffs)
• src/Shape.cpp (added)
• src/Shape.h (added)
• src/Transform.cpp (added)
• src/Transform.h (added)
• src/common.h (modified) (1 diff)

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

@@ -511 +511 @@
                                 </File>
                                 <File
+                                        RelativePath=".\src\LODInfo.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\src\Material.h"
                                         >
@@ -535 +539 @@
                                 </File>
                                 <File
+                                        RelativePath=".\src\Shape.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\src\Texture.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath=".\src\Transform.h"
                                         >
                                 </File>
@@ -679 +691 @@
                                 </File>
                                 <File
+                                        RelativePath=".\src\Shape.cpp"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\src\Texture.cpp"
                                         >
@@ -699 +715 @@
                                                 />
                                         </FileConfiguration>
+                                </File>
+                                <File
+                                        RelativePath=".\src\Transform.cpp"
+                                        >
                                 </File>
                                 <File

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

@@ -799 +799 @@
         for (int i = node->mFirst; i <= node->mLast; ++ i)
         {
+#ifdef TODO
                 numTriangles += mGeometry[i]->GetGeometry()->GetNumTriangles();
+#endif
         }
 

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

@@ -58 +58 @@
 
 
-bool RenderQueue::FitsInBucket(SceneEntity *ent, size_t idx) const
-{
+bool RenderQueue::FitsInBucket(Shape *ent, size_t idx) const
+{
+#ifdef TODO
         Material *mat = ent->GetMaterial();
-
+#else
+        Material *mat = NULL;
+#endif
         // test if entity belongs to this bucket
         // note: rather slows down the application for some reason!!
@@ -89 +92 @@
         RenderQueueBucket *bucket;
         ++ mSize;
-
+#ifdef TODO
         if (entity->mRenderQueueBucket)
         {
@@ -135 +138 @@
                 entity->mRenderQueueBucket = bucket;
         }
-
+#endif
         bucket->mEntities.push_back(entity);
 }
@@ -185 +188 @@
                 {
                         SceneEntity *ent = *sit;
-        
+        #ifdef TODO
                         Material *mat = ent->GetMaterial();
                         int tsize = mat->GetTexture() ? mat->GetTexture()->GetByteSize() : 0;
                         float dist = SqrMagnitude(ent->GetBoundingBox().Center() - mCamera->GetPosition());
                         Debug << "e: " << ent << " a: " << mat->IsAlphaTestEnabled() << " s: " << tsize << " d: " << dist << " " << endl;
+#endif
                 }
         }

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

@@ -29 +29 @@
         float mMinDistance;
 
-        SceneEntityContainer mEntities;
+        ShapeContainer mShapes;
 };
 
@@ -70 +70 @@
 protected:
 
-        inline bool FitsInBucket(SceneEntity *ent, size_t idx) const;
+        inline bool FitsInBucket(Shape *shape, size_t idx) const;
 
         /** Sorts the render queue by materials / textures.

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

@@ -109 +109 @@
                 {
                         SceneEntity *ent = entities[i];
+#ifdef TODO
                         mStats.mNumRenderedTriangles += ent->GetGeometry()->GetNumTriangles();
-
+#endif
                         if (mUseRenderQueue)
                                 mRenderQueue->Enqueue(ent);

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

@@ -57 +57 @@
 
         // use instancing
-        sceneGeom = new SceneEntity(geom, mat, trafo);
+        sceneGeom = new SceneEntity(trafo);
 
         return sceneGeom;

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

@@ -13 +13 @@
 CGparameter SceneEntity::sModelMatrixParam;
 
-SceneEntity::SceneEntity(Geometry *geometry, 
-                                                 Material *mat,
-                                                 Matrix4x4 *trafo):
-mGeometry(geometry), mMaterial(mat), mTransform(trafo), mRenderQueueBucket(NULL)
+SceneEntity::SceneEntity(Matrix4x4 *trafo): mTransform(trafo)
 {
 }
@@ -26 +23 @@
 
 
+ShapeContainer *SceneEntity::GetCurrentLOD()
+{
+        if (mLODInfos.empty())
+                return &mShapes;
+
+        float mDistance = 0.0f;
+
+        int i = 0;
+
+        for (int i = 0; i < mLODInfos.size(); ++ i)
+        {
+                if (mLODInfos[i].mDistance > mDistance)
+                        return mShapes[i];
+        }
+
+        return mShapes.last();
+}
+
+
 void SceneEntity::Render(RenderState *state)
 {
-        if (mMaterial) mMaterial->Render(state);
+        //if (mMaterial) mMaterial->Render(state);
+        float mDistance = 0.0f;
 
-        if (mTransform)
+        ShapeContainer *shapes;
+
+        shspes = GetCurrentLOD(mDistance);
+
+        for (int i = 0; i < shapes->size(); ++ i)
         {
-                if (state->GetRenderType() == RenderState::DEFERRED)
-                {
-                        cgGLSetMatrixParameterfc(sModelMatrixParam, (const float *)mTransform->x);
-
-                        mGeometry->Render(state);
-
-                        static Matrix4x4 identity = IdentityMatrix();
-                        cgGLSetMatrixParameterfc(sModelMatrixParam, (const float *)identity.x);
-                }
-                else
-                {
-                        glPushMatrix();
-                        glMultMatrixf((float *)mTransform->x);
-                        
-                        mGeometry->Render(state);
-
-                        glPopMatrix();
-                }
-        }
-        else
-        {
-                mGeometry->Render(state);
+                (shapes*)[i]->Render(state);
         }
 }
 
 
-void SceneEntity::SetGeometry(Geometry *geom)
+void SceneEntity::AddShape(Shape *shape)
 {
-        mGeometry = geom;
+        mShapes.push_back(shape);
 }
 
@@ -67 +67 @@
 {
         mTransform = trafo;
-}
-
-
-void SceneEntity::SetMaterial(Material *mat)
-{
-        mMaterial = mat;
 }
 
@@ -90 +84 @@
 AxisAlignedBox3 SceneEntity::GetBoundingBox() const
 {
+#ifdef TODO
         AxisAlignedBox3 box = mGeometry->GetBoundingBox();
+#else
+        AxisAlignedBox3 box;
+#endif
         if (mTransform) Transform(box, *mTransform);
 

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

@@ -8 +8 @@
 #include "AxisAlignedBox3.h"
 #include "Triangle3.h"
+#include "LODInfo.h"
 
 
 namespace CHCDemoEngine 
 {
-
-
 
 class Material;
@@ -28 +27 @@
 
 public:
-        static CGparameter sModelMatrixParam;
+        
         /** Creates a scene entity.
         */
-        SceneEntity(Geometry *geometry, Material *mat, Matrix4x4 *trafo);
+        SceneEntity(Transformation *trafo);
 
         ~SceneEntity();
@@ -37 +36 @@
         */
         void Render(RenderState *state);        
+        /** Set pointer to the shape
+        */
+        void AddShape(Shape *shape);
+        /** See set
+        */
+        inline Shape *GetShape(int i) const { return mShapes[i]; }
+        /** Returns number of shapes in vector.
+        */
+        inline int GetNumShapes() { return (int)mShapes.size(); }
         /** Set pointer to the geometry
         */
-        void SetGeometry(Geometry *geom);
-        /** See set
-        */
-        Geometry *GetGeometry() const { return mGeometry; }
-        /** Set pointer to the geometry
-        */
-        void SetTransformation(Matrix4x4 *trafo);
-        /** Set pointer to the material
-        */
-        void SetMaterial(Material *mat);
+        void SetTransformation(Transformation *trafo);
         /** Returns the transformed bounding box.
         */
@@ -58 +57 @@
         */
         int GetLastRendered() const;
-
-        inline Material *GetMaterial() const  { return mMaterial; }
-        inline Matrix4x4 *GetTransformation() const  { return mTransform; }
+        /** Returns the trafo of this scene entity.
+        */
+        inline Transformation *GetTransformation() const  { return mTransform; }
 
 protected:
 
         /// transform matrix 
-        Matrix4x4 *mTransform;
-        Geometry *mGeometry;
-        Material *mMaterial;
-        
+        Transformation *mTransform;
+
+        LODInfoContainer mLODInfos;
+
+        ShapeContainer mShapes;
+                
         int mLastRendered;
-        /// pointer to the renderqueue bucket this entity belongs to
-        RenderQueueBucket *mRenderQueueBucket;
 };
 

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

@@ -494 +494 @@
 #define INITIAL_TRIANGLES_PER_VIRTUAL_LEAVES 1000
 
-// #define PRINT_VERBOSE_BENCHMARKS
-}
-
-#endif
-
-
-
-
-
-
-
-
+class Shape;
+typedef std::vector<Shape *> ShapeContainer;
+
+struct LODInfo;
+typedef std::vector<LODInfo *> LODInfoContainer;
+
+}
+
+#endif
+
+
+
+
+
+
+
+