Changeset 2848 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SceneEntity.cpp

Timestamp:

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

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SceneEntity.cpp (modified) (5 diffs)

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;