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

Timestamp:

07/18/08 03:07:26 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• LODInfo.cpp (added)
• LODInfo.h (modified) (2 diffs)
• RenderQueue.cpp (modified) (1 diff)
• RenderTraverser.cpp (modified) (1 diff)
• SceneEntity.cpp (modified) (6 diffs)
• SceneEntity.h (modified) (3 diffs)
• Shape.cpp (modified) (3 diffs)
• Shape.h (modified) (3 diffs)
• chcdemo.cpp (modified) (4 diffs)

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

@@ -3 +3 @@
 
 #include "common.h"
+#include "Vector3.h"
 
 
@@ -21 +22 @@
         /// shapes belonging to this LOD level
         ShapeContainer mShapes;
+
+
+        /** Has to be called each frame in order to use proper LOD level.
+        */
+        static void InitFrame(const Vector3 &viewPoint);
+
+        static int sFrameId;
+        static Vector3 sViewPoint;
 };
 

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

@@ -144 +144 @@
                 // assume that the incoming nodes are ordered by distance 
                 // => set min dist on first incoming node
-                const Vector3 v = shape->GetTransformedBoundingBox().Center() - mCamera->GetPosition();
+                const Vector3 v = shape->GetCenter() - mCamera->GetPosition();
                 
                 const float dist = SqrMagnitude(v);

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

@@ -109 +109 @@
                 {
                         SceneEntity *ent = entities[i];
-                        ent->UpdateLODs(mCamera);
-                        
+                
                         mStats.mNumRenderedTriangles += ent->CountNumTriangles();
 

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

@@ -20 +20 @@
 
 SceneEntity::SceneEntity(Transform3 *trafo): 
-mTransform(trafo), mCurrentLODLevel(0)
+mTransform(trafo), mCurrentLODLevel(0), mLODLastUpdated(-1)
 {
         mBox.Initialize();
@@ -31 +31 @@
 
 
-void SceneEntity::UpdateLODs(Camera *cam)
+void SceneEntity::UpdateLODs(const Vector3 &viewPoint)
 {
-        const Vector3 pos = GetTransformedBoundingBox().Center();
+        const Vector3 pos = GetCenter();
 
-        const float distance = SqrDistance(pos, cam->GetPosition());
+        const float distance = SqrDistance(pos, viewPoint);
 
         mCurrentLODLevel = 0;
 
-        int l = (int)mLODLevels.size();
+        const int l = (int)mLODLevels.size();
 
         for (int i = 0; i < l; ++ i)
@@ -60 +60 @@
                                                                          ShapeContainer::iterator &end)
 {
+        if (mLODLastUpdated != LODLevel::sFrameId)
+        {
+                mLODLastUpdated = LODLevel::sFrameId;
+                UpdateLODs(LODLevel::sViewPoint);
+        }
+
         start = mLODLevels[mCurrentLODLevel]->mShapes.begin(); 
         end = mLODLevels[mCurrentLODLevel]->mShapes.end();
@@ -80 +86 @@
         ShapeContainer::iterator sit, sit_end;
 
-        /*if (mShapes.size() > 8)
-        {
-                sit = mShapes.begin() + 6;
-                sit_end = mShapes.begin() + 6;
-        }
-        else*/
-                GetCurrentLODLevel(sit, sit_end);
+        GetCurrentLODLevel(sit, sit_end);
 
-        //if (mShapes.size() > 1)
-                //mShapes[0]->Render(state);
         for (; sit != sit_end; ++ sit)
         {
@@ -101 +99 @@
         mShapes.push_back(shape);
         mBox.Include(shape->GetBoundingBox());
+
+        mCenter = mBox.Center();
 }
 
@@ -163 +163 @@
 }
 
+
+Vector3 SceneEntity::GetCenter() const
+{
+        Matrix4x4 *mat = mTransform->GetMatrix();
+
+        if (!mat)
+                return mCenter;
+
+        return (*mat) * mCenter;
 }
+
+
+}

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

@@ -74 +74 @@
         ////////////////
 
-        /** Internally updates current lod level.
-        */
-        void UpdateLODs(Camera *cam);
+        
         /** Returns shapes of specified lod level
         */
@@ -90 +88 @@
         int GetNumLODLevels() const { return (int)mLODLevels.size(); }
 
+        /** Returns transformed center point of this shape.
+        */
+        Vector3 GetCenter() const;
+
 protected:
 
+        /** Internally updates current lod level.
+        */
+        void UpdateLODs(const Vector3 &viewPoint);
+
+
+
+        /// the bounding box
         AxisAlignedBox3 mBox;
         /// transform matrix 
@@ -103 +112 @@
 
         int mCurrentLODLevel;
+
+        /// which frame the lod info was last updated
+        int mLODLastUpdated;
+
+        Vector3 mCenter;
 };
 

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

@@ -16 +16 @@
 mRenderQueueBucket(NULL)
 {
+        mCenter = GetBoundingBox().Center();
 }
 
@@ -30 +31 @@
         mGeometry->Render(state);
         mParent->GetTransform()->Unload(state);
-
 }
 
@@ -63 +63 @@
 }
 
+
+Vector3 Shape::GetCenter() const
+{
+        Matrix4x4 *mat = mParent->GetTransform()->GetMatrix();
+
+        if (!mat) return mCenter;
+
+        return (*mat) * mCenter;
 }
+
+
+}

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

@@ -6 +6 @@
 #include <Cg/cgGL.h>
 #include "common.h"
+#include "Vector3.h"
 
 
@@ -16 +17 @@
 class RenderState;
 class AxisAlignedBox3;
+class Vector3;
 
 struct RenderQueueBucket;
@@ -53 +55 @@
 
         inline Material *GetMaterial() const  { return mMaterial; }
+        /** Returns transformed center point of this shape.
+        */
+        Vector3 GetCenter() const;
+
 
 protected:
+
+        Vector3 mCenter;
 
         Geometry *mGeometry;

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

@@ -456 +456 @@
         // create noise texture for ssao
         CreateNoiseTex2D();
+
         // init render traverser
         ResetTraverser();
 
-
         visualization = new Visualization(bvh, camera, NULL, &state);
 
         sceneQuery = new SceneQuery(bvh->GetBox(), traverser);
+
+        // frame time is restarted every frame
+        frameTimer.Start();
 
 
@@ -1099 +1102 @@
 void Display() 
 {       
-        glFlush();
-        elapsedTime = frameTimer.Elapsedms();
-
-        // take time from last frame
-        frameTimer.Start();
-
         Vector3 oldPos = camera->GetPosition();
 
@@ -1193 +1190 @@
                 
 
+        LODLevel::InitFrame(camera->GetPosition());
+
+
         // bring eye modelview matrix up-to-date
         SetupEyeView();
@@ -1272 +1272 @@
                 if (visMode) DisplayVisualization();
         }
+
+        glFlush();
+
+        const bool restart = true;
+        elapsedTime = frameTimer.Elapsedms(restart);
 
         DisplayStats();