Changeset 2848 for GTP/trunk

Timestamp:

07/21/08 03:12:51 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• Bvh.cpp (modified) (3 diffs)
• LODInfo.cpp (modified) (2 diffs)
• LODInfo.h (modified) (2 diffs)
• RenderQueue.cpp (modified) (1 diff)
• RenderQueue.h (modified) (1 diff)
• RenderTraverser.cpp (modified) (1 diff)
• ResourceManager.cpp (modified) (1 diff)
• SceneEntity.cpp (modified) (5 diffs)
• SceneEntity.h (modified) (4 diffs)
• SceneQuery.cpp (modified) (5 diffs)
• SceneQuery.h (modified) (1 diff)
• Shape.h (modified) (2 diffs)
• chcdemo.cpp (modified) (1 diff)

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

@@ -144 +144 @@
         mGeometry = new SceneEntity*[mGeometrySize];
 
-        mBox.Initialize();
-
         SceneEntityContainer::const_iterator it, it_end = entities.end();
 
@@ -152 +150 @@
         {
                 mGeometry[i] = (*it);
-                //mBox.Include((*it)->GetBoundingBox());
-        }
-
-        cout << "scene box: " << mBox << endl;
+        }
 }
 
@@ -799 +794 @@
         for (int i = node->mFirst; i <= node->mLast; ++ i)
         {
-                numTriangles += mGeometry[i]->CountNumTriangles();
+                numTriangles += mGeometry[i]->CountNumTriangles(0);
         }
 

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

@@ -1 +1 @@
 #include "LODInfo.h"
 #include "Vector3.h"
+#include "Shape.h"
+#include "Geometry.h"
+
 
 
@@ -17 +20 @@
 
 
+void LODLevel::AddShape(Shape *shape)
+{
+        mShapes.push_back(shape);
+        mNumTriangles += shape->GetGeometry()->GetNumTriangles();
 }
+
+
+}

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

@@ -13 +13 @@
 struct LODLevel
 {
+        //friend class SceneEntity;
+
 public:
         
         LODLevel(float squaredDist): mSquaredDistance(squaredDist) {}
 
+        inline float GetSquaredDistance() { return mSquaredDistance; }
+
+        inline int GetNumShapes() { return (int)mShapes.size(); }
+        
+        inline int GetNumTriangles() { return mNumTriangles; }
+
+        inline Shape *GetShape(size_t i) { return mShapes[i]; }
+
+        inline ShapeContainer &GetShapes() { return mShapes; }
+
+        void AddShape(Shape *shape);
+
+
+        ////////////////
+
+        /** 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;
+
+
+
+protected:
+
+        /////////////////////
+
+        float mNumTriangles;
 
         /// distance of this LOD level
@@ -22 +54 @@
         /// 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

@@ -188 +188 @@
                 }
         }
-
         //Print();
 }

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

@@ -86 +86 @@
         void Print();
 
+
         ///////////
 
         RenderState *mState;
+        
         Camera *mCamera;
         //SceneEntityContainer mEntities;

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

@@ -270 +270 @@
                  
         if (mRenderQueue->GetSize() > 0)
+        {
                 ++ mStats.mNumBatches;
-
-        mRenderQueue->Apply();
-}
-
-
-}
+                mRenderQueue->Apply();
+        }
+}
+
+
+}

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

@@ -91 +91 @@
 
                         sceneGeom->AddShape(shape);
-                        lodLevel->mShapes.push_back(shape);
+                        lodLevel->AddShape(shape);
                 }
 

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

@@ -45 +45 @@
                 LODLevel *lod = mLODLevels[i];
 
-                if (lod->mSquaredDistance > distance)
+                if (lod->GetSquaredDistance() > distance)
                         break;
 
                 mCurrentLODLevel = i;
         }
+}
 
-        /*if (mLODLevels.size() > 1)
+
+int SceneEntity::GetCurrentLODLevel()
+{
+        if (mLODLastUpdated != LODLevel::sFrameId)
         {
-                Debug << "dist: " << distance << " numshapes: " << mLODLevels[mCurrentLODLevel]->mShapes.size() << " lod: " << mCurrentLODLevel << " of " << mLODLevels.size() << endl;
-        }*/
+                mLODLastUpdated = LODLevel::sFrameId;
+                UpdateLODs(LODLevel::sViewPoint);
+        }
+
+        return mCurrentLODLevel;
 }
+
 
 void SceneEntity::GetCurrentLODLevel(ShapeContainer::iterator &start, 
@@ -66 +74 @@
         }
 
-        start = mLODLevels[mCurrentLODLevel]->mShapes.begin(); 
-        end = mLODLevels[mCurrentLODLevel]->mShapes.end();
+        start = mLODLevels[mCurrentLODLevel]->GetShapes().begin(); 
+        end   = mLODLevels[mCurrentLODLevel]->GetShapes().end();
 }
 
@@ -77 +85 @@
         LODLevel *lod = mLODLevels[level];
 
-        start = lod->mShapes.begin();
-        end = lod->mShapes.end();
+        start = lod->GetShapes().begin();
+        end = lod->GetShapes().end();
 }
 
@@ -130 +138 @@
         if (lodLevel == -1)
         {
-                GetCurrentLODLevel(sit, sit_end);
-        }
-        else
-        {
-                GetLODLevel(lodLevel, sit, sit_end);
+                lodLevel = GetCurrentLODLevel();
         }
 
-
-        for (; sit != sit_end; ++ sit)
-        {
-                numTriangles += (*sit)->GetGeometry()->GetNumTriangles();
-        }
-
-        return numTriangles;
+        return mLODLevels[lodLevel]->GetNumTriangles();
 }
 
@@ -168 +166 @@
         Matrix4x4 *mat = mTransform->GetMatrix();
 
-        if (!mat)
-                return mCenter;
+        if (!mat) return mCenter;
 
         return (*mat) * mCenter;

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

@@ -62 +62 @@
                 with 0 being the highest or the current lod level (if the argument is -1).
         */
-        int CountNumTriangles(int lodLevel = 0);
+        int CountNumTriangles(int lodLevel = -1);
         /** Returns the bounding box.
         */
@@ -87 +87 @@
         */
         int GetNumLODLevels() const { return (int)mLODLevels.size(); }
-
         /** Returns transformed center point of this shape.
         */
         Vector3 GetCenter() const;
+
+
 
 protected:
@@ -97 +98 @@
         */
         void UpdateLODs(const Vector3 &viewPoint);
-
+        /** Returns updated index of current lod level.
+        */
+        int GetCurrentLODLevel();
 
 
@@ -112 +115 @@
 
         int mCurrentLODLevel;
-
         /// which frame the lod info was last updated
         int mLODLastUpdated;
-
+        /// the center of gravity of this scene entity
         Vector3 mCenter;
 };

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

@@ -7 +7 @@
 #include <IL/il.h>
 #include <assert.h>
-#include "RenderTexture.h"
+//#include "RenderTexture.h"
 
 
 using namespace std;
 
-static int texWidth = 2048;
-static int texHeight = 2048;
+const static int texWidth = 2048;
+const static int texHeight = 2048;
 
 
@@ -107 +107 @@
         {
                 // temporal smoothing of depth values
-                const float x = 0.5f;
+                const float x = .5f;
                 depth = d * x + depth * (1.0f - x);
 
@@ -131 +131 @@
 
         orthoCam->SetNear(0.0f);
-        orthoCam->Yaw(-M_PI * 0.5f);
+        orthoCam->Yaw(M_PI * 0.5f);
 
         Vector3 pos = Vector3(mSceneBox.Center().x, mSceneBox.Center().y, mSceneBox.Max().z);
@@ -165 +165 @@
                 glPushMatrix();
 
-                glOrtho(-xlen, xlen, -ylen, ylen, 0.0f, mSceneBox.Size().z); 
+                glOrtho(+xlen, -xlen, ylen, -ylen, 0.0f, mSceneBox.Size().z); 
 
                 glMatrixMode(GL_MODELVIEW);
@@ -185 +185 @@
 
         GrabDepthBuffer(mDepth, depthTexture);
-        //ExportDepthBuffer(mDepth);
-        //PrintGLerror("grab");
+        ExportDepthBuffer(mDepth);
+        PrintGLerror("grab");
 
         DEL_PTR(depthTexture);

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

@@ -21 +21 @@
 
         ~SceneQuery() { DEL_ARRAY_PTR(mDepth); }
-
         /** Calculates intersection of vertical ray at position pt.x, pt.y and 
             stores the intersection point if valid. returns true if the intersection 

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

@@ -53 +53 @@
         */
         AxisAlignedBox3 GetTransformedBoundingBox() const;
-
+        /** Returns material of this shape.
+        */
         inline Material *GetMaterial() const  { return mMaterial; }
         /** Returns transformed center point of this shape.
@@ -67 +68 @@
         Material *mMaterial;
         SceneEntity *mParent;
-
         /// pointer to the renderqueue bucket this entity belongs to
         RenderQueueBucket *mRenderQueueBucket;

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

@@ -2022 +2022 @@
         bool validIntersect = sceneQuery->CalcIntersection(playerPos);
 
-        if (validIntersect &&
-                (( playerPos.z - oldPos.z) < bvh->GetBox().Size(2) * 1e-1f))
+        if (validIntersect ) 
+                // && ((playerPos.z - oldPos.z) < bvh->GetBox().Size(2) * 1e-1f))
         {
                 camera->SetPosition(playerPos);