Changeset 1782

Timestamp:

11/22/06 15:51:08 (18 years ago)

Author:

gumbau

Message:

Fixed bug selecting the lowest LOD in the Foliage class.

Location:

GTP/trunk/Lib/Geom/shared/GTGeometry

Files:

• GTGeometry.vcproj (modified) (1 diff)
• src/GeoLodTreeLibrary.cpp (modified) (1 diff)
• src/libs/leaves/foliage.cpp (modified) (2 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/GTGeometry.vcproj

@@ -34 +34 @@
                         <Tool
                                 Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/GTGeometry_d.lib"/>
+                                OutputFile="$(OutDir)/GTGeometry_d.lib"
+                                IgnoreAllDefaultLibraries="TRUE"/>
                         <Tool
                                 Name="VCMIDLTool"/>

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

@@ -102 +102 @@
                                                                                                         +
                                                                                 newlod * foliage->leafCount     );
-
+        
         foliage->CalculateLOD(targetLeaves);
 

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/leaves/foliage.cpp

@@ -84 +84 @@
 void Foliage::CalculateLOD(int nleaves)
 {
-        if ((nleaves <= leafCount) && (nleaves > minLeaves))
+        if (nleaves>=leafCount)
+                nleaves=leafCount-1;
+//      if (nleaves<=minLeaves)
+//              nleaves=minLeaves+1;    
+        if ((nleaves < leafCount) && (nleaves >= minLeaves))
         {
                 if ( nleaves < active_leaf_count) {
@@ -106 +110 @@
         j = num;
         h = final+1;
-                while ((h<=leafTotal) && (j>0))
+                while ((h<leafTotal) && (j>0))
                 {
                         while (( begin == Leaves[h].childLeft) || ( begin == Leaves[h].childRight))