Changeset 1541 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoLodStripsLibrary.cpp

Timestamp:

09/29/06 11:19:25 (18 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoLodStripsLibrary.cpp (modified) (8 diffs)

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

@@ -13 +13 @@
 
 using namespace Geometry;
+using   namespace       std;
 
 //-----------------------------------------------------------------------------
@@ -82 +83 @@
 void LodStripsLibrary::GoToLod(float lodfactor)
 {
-        register        int                             j;
-        register        int                             offset;
+        register        int                     j;
+        register        int                     offset;
         long                    int                     i;
         long                    int                     k;
         long                    int                     b_change_ok     =       1;
-        unsigned long   int                     lod;
+        unsigned long   int     lod;
         long                    int                     t;
         long                    int                     r;
@@ -95 +96 @@
         long                    int                     total_changes;
         long                    int                     totalR;
-        SmallIntVector                          *strip;
+        SmallIntVector                                          *strip;
         SmallIntVector::iterator        start;
 
@@ -104 +105 @@
 
         lodFactor=lodfactor;
-//      LODRegisterType * lastLOD = mCurrentRegLOD;
     
         if (newLOD != mCurrentLod)
@@ -112 +112 @@
                         //      Forwards.
                         //      Increments LOD (decreases level of detail)
-                        for (lod = mCurrentLod; lod < newLOD || (mCurrentRegLOD->obligatory==1 && mCurrentLod<mLods-1); lod++)
-                        {
-                                next                    =       mVertex[lod];
+                        for (   lod     =       mCurrentLod;
+                                                (lod < newLOD)
+                                                ||
+                                                ((mCurrentRegLOD->obligatory == 1) && (lod < (mLods - 1)));
+                                                lod++)
+                        {
+                                next                                    =       mVertex[lod];
                                 total_changes   =       mPChanges[lod];
 
@@ -120 +124 @@
                                 {
                                         //      Strip change.
-                                        t               =       mCurrentRegLOD->strip; 
+                                        t                       =       mCurrentRegLOD->strip;
                                         strip   =       &(mStrips[t]);
-                                        start   =       strip->begin();                         
+                                        start   =       strip->begin();
+
                                         int stripsize_ini = strip->size();
                                 
@@ -188 +193 @@
                         mCurrentRegLOD--;
                         mCurrentData--;
-                        
+
+
                         //      Decrements LOD.
-                        for (lod = mCurrentLod; lod > newLOD || (mCurrentRegLOD->obligatory==1 && mCurrentLod>0); lod--)
-                        {
+                        for (   lod     =       mCurrentLod;
+                                                (lod > newLOD)
+                                                ||
+                                                ((mCurrentRegLOD->obligatory == 1) && (lod > 0))
+                                                ||
+                                                ((mCurrentRegLOD[1].obligatory == 1) && (lod > 0));
+                                                lod--)
+                        {
+
                                 total_changes   =       mPChanges[lod - 1];
                                 
@@ -252 +265 @@
                                         int stripsize_end = strip->size();
                                         indices_x_submesh[submesh_x_strip[t]] += (stripsize_end - stripsize_ini);
-
                                 }                       
                                 
-                                //      Update LOD.                             
+                                //      Update LOD.
                                 mCurrentLod     =       lod - 1;
+
+                                //      Debug.
+                                cout    <<      "Obligatory: "
+                                                        <<      (int)mCurrentRegLOD->obligatory
+                                                        <<      endl;
                         }