Changeset 2842 for GTP

Timestamp:

07/16/08 17:19:25 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• Bvh.cpp (modified) (2 diffs)
• Geometry.h (modified) (1 diff)
• RenderQueue.cpp (modified) (12 diffs)
• RenderQueue.h (modified) (1 diff)
• RenderTraverser.cpp (modified) (1 diff)
• ResourceManager.cpp (modified) (6 diffs)
• ResourceManager.h (modified) (2 diffs)
• SceneEntity.cpp (modified) (5 diffs)
• SceneEntity.h (modified) (2 diffs)
• Shape.cpp (modified) (3 diffs)
• Shape.h (modified) (2 diffs)

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

@@ -152 +152 @@
         {
                 mGeometry[i] = (*it);
-                mBox.Include((*it)->GetBoundingBox());
+                //mBox.Include((*it)->GetBoundingBox());
         }
 
@@ -799 +799 @@
         for (int i = node->mFirst; i <= node->mLast; ++ i)
         {
-#ifdef TODO
-                numTriangles += mGeometry[i]->GetGeometry()->GetNumTriangles();
-#endif
+                numTriangles += mGeometry[i]->CountNumTriangles();
         }
 

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

@@ -35 +35 @@
 
         inline bool HasTexture() const { return mHasTexture; }
+        
         const AxisAlignedBox3& GetBoundingBox() const;
 

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

@@ -14 +14 @@
 {
 
-static Camera *sCam = NULL;
-
-
-inline static bool CompDist(SceneEntity *e1, SceneEntity *e2)
-{
-        return 
-                (SqrMagnitude(e1->GetBoundingBox().Center() - sCam->GetPosition()) <
-                 SqrMagnitude(e2->GetBoundingBox().Center() - sCam->GetPosition()));
-}
-
 
 inline static bool CompDist2(RenderQueueBucket *b1, RenderQueueBucket *b2)
@@ -29 +19 @@
         return (b1->mMinDistance < b2->mMinDistance);
 }
+
 
 
@@ -46 +37 @@
 mSize(0)
 {
-        sCam = cam;
 }
 
@@ -91 +81 @@
         shapes.clear();
 
-        entity->GetCurrentLODLevel(shapes)
+        entity->GetCurrentLODLevel(shapes);
 
         ShapeContainer::const_iterator sit, sit_end = shapes.end();
@@ -107 +97 @@
         ++ mSize;
         
-        if (entity->mRenderQueueBucket)
-        {
-                bucket = entity->mRenderQueueBucket;
+        if (shape->mRenderQueueBucket)
+        {
+                bucket = shape->mRenderQueueBucket;
         }
         else
@@ -119 +109 @@
                 for (; i < mBuckets.size(); ++ i)
                 {
-                        if (bucketFound = FitsInBucket(entity, i))
+                        if (bucketFound = FitsInBucket(shape, i))
                                 break;
                 }
@@ -128 +118 @@
                         RenderQueueBucket *bucket = new RenderQueueBucket();
 
-                        Material *mat = entity->GetMaterial();
+                        Material *mat = shape->GetMaterial();
 
                         bucket->mAlphaTestEnabled = mat->IsAlphaTestEnabled();
@@ -143 +133 @@
                         // assume that the incoming nodes are ordered by distance => set min dist
                         // on first incoming node
-                        float dist = SqrMagnitude(entity->GetBoundingBox().Center() - mCamera->GetPosition());
+                        Vector3 v = shape->GetTransformedBoundingBox().Center() - mCamera->GetPosition();
+                        const float dist = SqrMagnitude(v);
                         mBuckets[i]->mMinDistance = dist;
 
@@ -150 +141 @@
 
                 bucket = mBuckets[i];
-                entity->mRenderQueueBucket = bucket;
-        }
-
-        bucket->mEntities.push_back(entity);
+                shape->mRenderQueueBucket = bucket;
+        }
+
+        bucket->mShapes.push_back(shape);
 }
 
@@ -174 +165 @@
 void RenderQueue::Render()
 {
+        // sort the buckets
         Sort();
-        
+
         // render all buckets
         for (size_t i = 0; i < mBuckets.size(); ++ i)
@@ -215 +207 @@
 
 
+void RenderQueue::Sort()
+{
+        // sort buckets itself
+        sort(mBuckets.begin(), mBuckets.end(), CompDist2);
+}
+
+
 void RenderQueue::Apply()
 {
@@ -222 +221 @@
 
 
-void RenderQueue::Sort()
-{
-        // sort buckets itself
-        sort(mBuckets.begin(), mBuckets.end(), CompDist2);
-}
-
-
-}
+}

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

@@ -70 +70 @@
 protected:
 
+        void Sort();
+
         void Enqueue(Shape *shape);
 
         inline bool FitsInBucket(Shape *shape, size_t idx) const;
-
-        /** Sorts the render queue by materials / textures.
-        */
-        void Sort();
         /** Clears the render queue
         */

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

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

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

@@ -9 +9 @@
 #include "Vector3.h"
 #include "Transform3.h"
+#include "Shape.h"
 
 
@@ -26 +27 @@
         CLEAR_CONTAINER(mTextures);
         CLEAR_CONTAINER(mTrafos);
+        CLEAR_CONTAINER(mShapes);
 }
 
@@ -62 +64 @@
         sceneGeom = new SceneEntity(trafo);
 
+        // create shape
+        Shape *shape = new Shape(geom, mat, sceneGeom);
+        mShapes.push_back(shape);
+
+        sceneGeom->AddShape(shape);
+
         return sceneGeom;
 }
@@ -104 +112 @@
 
                 mGeometryTable[i] = geom;
-                mMaterialTable[i] = mat;
+                mMaterialTable[i] = mat;                
 
                 mGeometry.push_back(geom);
@@ -199 +207 @@
                 SceneEntity *ent = LoadSceneEntity(str);
                 entities[i] = ent;
+
                 mSceneEntities.push_back(ent);
         }
@@ -232 +241 @@
         mGeometryTable.clear();
         mMaterialTable.clear();
+        //mShapesTable.clear();
 
         return true;

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

@@ -48 +48 @@
         std::map<int, Material *> mMaterialTable;
         std::map<int, Geometry *> mGeometryTable;
+        //std::map<int, Shape *> mShapesTable;
 
         // these are kept to be able to delete these resources afterwards
@@ -53 +54 @@
         std::vector<Material *> mMaterials;
         std::vector<Geometry *> mGeometry;
-        std::vector<SceneEntity *> mSceneEntities;
         std::vector<Transform3 *> mTrafos;
+        
+        SceneEntityContainer mSceneEntities;
+        ShapeContainer mShapes;
 };
 

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

@@ -9 +9 @@
 
 
+using namespace std;
+
+
 namespace CHCDemoEngine 
 {
+
 
 SceneEntity::SceneEntity(Transform3 *trafo): mTransform(trafo)
@@ -26 +30 @@
         ShapeContainer::const_iterator sit, sit_end;
 
-        if (mLODInfos->empty())
+        if (mLODInfos.empty())
         {
                 sit = mShapes.begin(); sit_end = mShapes.end();
@@ -35 +39 @@
         int i = 0;
 
-        LODInfo *info;
-
         LODInfoContainer::const_iterator lid, lid_end = mLODInfos.end();
 
         for (lid = mLODInfos.begin(); lid != lid_end; ++ lid)
         {
-                info = *lid;
+                LODInfo *lodInfo = *lid;
 
-                if (info->mDistance > mDistance)
+                if (lodInfo->mSquaredDistance > mDistance)
                 {
-                        sit = info->mShapes.begin(); 
-                        sit_end = info->mShapes.end();
+                        sit = lodInfo->mShapes.begin(); 
+                        sit_end = lodInfo->mShapes.end();
                         break;
                 }
@@ -70 +72 @@
         ShapeContainer::const_iterator sit, sit_end = shapes.end();
 
-        for (; sit != sit_end; ++ sit)
+        for (sit = shapes.begin(); sit != sit_end; ++ sit)
         {
                 (*sit)->Render(state);
@@ -101 +103 @@
 
 
-AxisAlignedBox3 SceneEntity::GetBoundingBox() const
+int SceneEntity::CountNumTriangles()
 {
-#ifdef TODO
-        AxisAlignedBox3 box = mGeometry->GetBoundingBox();
-        if (mTransform) Transform(box, *mTransform);
-#else
-        AxisAlignedBox3 box;
-#endif
-        
+        int numTriangles = 0;
+        static ShapeContainer shapes;
+        shapes.clear();
 
-        return box;
+        GetCurrentLODLevel(shapes);
+
+        ShapeContainer::const_iterator sit, sit_end = shapes.end();
+
+        for (sit = shapes.begin(); sit != sit_end; ++ sit)
+        {
+                numTriangles += (*sit)->GetGeometry()->GetNumTriangles();
+        }
+
+        return numTriangles;
 }
 

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

@@ -51 +51 @@
         /** Returns the transformed bounding box.
         */
-        AxisAlignedBox3 GetBoundingBox() const;
+        //AxisAlignedBox3 GetBoundingBox() const;
         /** set frame where we last rendered this node
         */
@@ -62 +62 @@
         inline Transform3 *GetTransform() const  { return mTransform; }
 
+        void GetCurrentLODLevel(ShapeContainer &shapes);
 
-        void GetCurrentLODLevel(ShapeContainer &shapes);
+        int CountNumTriangles();
+
 
 protected:

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

@@ -4 +4 @@
 #include "Geometry.h"
 #include "SceneEntity.h"
-
-#include "glInterface.h"
-#include <Cg/cg.h>
-#include <Cg/cgGL.h>
+#include "Transform3.h"
 
 
@@ -30 +27 @@
         if (mMaterial) mMaterial->Render(state);
 
+        mParent->GetTransform()->Load(state);
         mGeometry->Render(state);
+        mParent->GetTransform()->Unload(state);
+
 }
 
@@ -46 +46 @@
 
 
+
+AxisAlignedBox3 Shape::GetBoundingBox() const
+{
+        return mGeometry->GetBoundingBox();
 }
+
+
+AxisAlignedBox3 Shape::GetTransformedBoundingBox() const
+{
+        AxisAlignedBox3 box = mGeometry->GetBoundingBox();
+        Matrix4x4 *mat = mParent->GetTransform()->GetMatrix();
+
+        if (mat) Transform(box, *mat);
+
+        return box;
+}
+
+}

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

@@ -12 +12 @@
 
 
-
 class Material;
 class Geometry;
 class RenderState;
+class AxisAlignedBox3;
+
 struct RenderQueueBucket;
+
 
 /** Class representing a shape.
@@ -43 +45 @@
         */
         void SetMaterial(Material *mat);
-        
+        /** Returns the transformed bounding box.
+        */
+        AxisAlignedBox3 GetBoundingBox() const;
+        /** Returns bounding box transformed with the parent transform.
+        */
+        AxisAlignedBox3 GetTransformedBoundingBox() const;
+
         inline Material *GetMaterial() const  { return mMaterial; }