Changeset 1071 for GTP/trunk/Lib/Geom/shared/GTGeometry/src

Timestamp:

06/30/06 17:40:29 (19 years ago)

Author:

gumbau

Message:

 

File:

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

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

@@ -18 +18 @@
         {
         public:
-                lodobj_idpos_node_t(LodObject *o):lodobj(o){}
+                lodobj_idpos_node_t(LodObject *o):lodobj(o),must_recalculate_distance(true),dist2cam(0.0f){}
                 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()); }
         };
@@ -45 +47 @@
         if (camera_changed)
         {
-                // if the camera has changed, recalculate all lodobject distances to it
-                float random_dist = SelectRandomDistance();
-
+                // 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)
+                        {
+                                const Vector3 & pos = it->second;
+                                float newdist = CalculateDistToCamera(pos);
+                                lodobj_dists[newdist] = lodobj_dist_node_t(posnode.lodobj);
+/*                              lodobj_dists.erase(it);*/
+                        }
+                }
+        }
+
+        // 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);
 }