Changeset 1309 for GTP/trunk/Lib/Geom

Timestamp:

09/01/06 10:52:30 (18 years ago)

Author:

gumbau

Message:

Lod Manager structure modification

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoLodManager.cpp (modified) (5 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoLodManager.cpp

@@ -12 +12 @@
 #include "GeoLodManager.h"
 #include "GeoLodObject.h"
-
+#include <algorithm>
+/*
 namespace Geometry
 {
+
+
         class lodobj_idpos_node_t
         {
@@ -21 +24 @@
                 LodObject *lodobj;
                 float dist2cam; // used to index the lodobj in the other map
-                bool must_recalculate_distance;
                 bool operator < (const lodobj_idpos_node_t &o) const { return (lodobj->GetUniqueID()<o.lodobj->GetUniqueID()); }
         };
-}
+}*/
 
 using namespace Geometry;
@@ -32 +34 @@
  near_range(near),far_range(far)
 {
+        // make the lodobj_dists vector into a heap
+        make_heap(lodobj_dists.begin(),lodobj_dists.end());
 }
 
 void Geometry::LodManager::AddLodObj(LodObject * o, const Geometry::Vector3 &p)
 {
-        float dist = CalculateDistToCamera(p);  
-        lodobj_dists[dist] = lodobj_dist_node_t(o);
+        float dist = CalculateDistToCamera(p);
+        lodobj_dists.push_back(lodobj_dist_node_t(dist,o));
+        push_heap(lodobj_dists.begin(),lodobj_dists.end());
+//      lodobj_dists[dist] = lodobj_dist_node_t(o);
         UpdateLODObjectPos(o,p);
 }
@@ -44 +50 @@
 void Geometry::LodManager::UpdateLOD(void)
 {
-        // recalculate distances if have to
-        if (camera_changed)
+        if (!lodobj_dists.empty())
         {
-                // if the camera has changed, recalculate all lodobject distances to it         
-                lodobj_dists.clear();
-                for (std::map<Geometry::lodobj_idpos_node_t,Geometry::Vector3>::iterator it = lodobj_pos.begin(); it != lodobj_pos.end(); it++)
-                {
-                        const lodobj_idpos_node_t & posnode = it->first;
-                        const Vector3 & pos = it->second;
-                        float newdist = CalculateDistToCamera(pos);
-                        lodobj_dists[newdist] = lodobj_dist_node_t(posnode.lodobj);
-                }
-                camera_changed=false;
-        }
-        else
-        {
-                // if any of the objects changed its position, the distance must be recalculated
-                for (std::map<Geometry::lodobj_idpos_node_t,Geometry::Vector3>::iterator it = lodobj_pos.begin(); it != lodobj_pos.end(); it++)
-                {
-                        const lodobj_idpos_node_t & posnode = it->first;
-                        if (posnode.must_recalculate_distance)
+                // update distances to the camera
+                bool must_resort = false;
+                for (std::vector<lodobj_dist_node_t>::iterator it=lodobj_dists.begin(); it!=lodobj_dists.end(); it++)
+                {                       
+                        lodobj_dist_node_t & node = *it;
+                        if (camera_changed || node.must_recalculate_distance)
                         {
-                                const Vector3 & pos = it->second;
-                                float newdist = CalculateDistToCamera(pos);
-                                lodobj_dists[newdist] = lodobj_dist_node_t(posnode.lodobj);
-/*                              lodobj_dists.erase(it);*/
+                                RecalculateDist(node);
+                                must_resort=true;
                         }
                 }
+                if (must_resort)
+                        sort_heap(lodobj_dists.begin(),lodobj_dists.end());
+
+                // select a tree to change its LOD
+        //      float random_dist = SelectRandomDistance();
+        //      std::map<float,Geometry::lodobj_dist_node_t>::iterator nearest = lodobj_dists.upper_bound(random_dist);
+
+                // the begining of the list is the greater element (greater dist)               
+                lodobj_dist_node_t & node = lodobj_dists.front();
         }
+        camera_changed=false;
+}
 
-        // select a tree to change its LOD
-        float random_dist = SelectRandomDistance();
-        std::map<float,Geometry::lodobj_dist_node_t>::iterator nearest = lodobj_dists.upper_bound(random_dist);
+void Geometry::LodManager::RecalculateDist(lodobj_dist_node_t & node)
+{
+        std::map<uint32,Vector3>::iterator posit = lodobj_pos.find(node.lodobj->GetUniqueID());
+        assert(posit!=lodobj_pos.end());
+        const Vector3 & pos = posit->second;
+
+        node.dist2cam = CalculateDistToCamera(pos);
 }
+
 
 void Geometry::LodManager::UpdateCamera(const Geometry::Vector3 &p)
@@ -87 +94 @@
 void Geometry::LodManager::UpdateLODObjectPos(LodObject *o, const Geometry::Vector3 &p)
 {
-        lodobj_pos[lodobj_idpos_node_t(o)] = p;
+        lodobj_pos[o->GetUniqueID()] = p;
 }