Changeset 1058 for GTP/trunk/Lib/Geom/shared/GTGeometry/include

Timestamp:

06/26/06 17:36:46 (18 years ago)

Author:

gumbau

Message:

LODs parameters changed to the range 1-0 (max-min)

Location:

GTP/trunk/Lib/Geom/shared/GTGeometry/include

Files:

• GeoLodObject.h (modified) (1 diff)
• GeoLodStripsLibrary.h (modified) (6 diffs)
• GeoLodTreeLibrary.h (modified) (3 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/include/GeoLodObject.h

@@ -12 +12 @@
                 }
                 uint32 GetUniqueID(void) const { return  uniqueID; }
-                virtual uint32 GoToLod(uint32)=0;
+                virtual void GoToLod(Real)=0;
 
         private:

GTP/trunk/Lib/Geom/shared/GTGeometry/include/GeoLodStripsLibrary.h

@@ -15 +15 @@
 #include        "GeoMesh.h"
 #include        <vector>
-#include        <time.h>
 #include        "VertexData.h"
 #include "GeoLodObject.h"
@@ -80 +79 @@
                         //      Structures with the data read from the file
                         //      We won't work with these structures
-                        SmallIntVector                                                                  mFileVertices;
-                        std::vector     <LODRegisterType>               mFileChangesLOD;
-                        std::vector     <SmallIntVector>                mFileStrips;
-                        LongVector                                                                                      mData;
+                        SmallIntVector                                  mFileVertices;
+                        std::vector     <LODRegisterType>       mFileChangesLOD;
+                        std::vector     <SmallIntVector>        mFileStrips;
+                        LongVector                                              mData;
 
                         //      Structures with the data to work with
@@ -105 +104 @@
 
                         //      For the efficient version.
-                        SmallInt                                mTotalFaces;
-                        SmallInt                                *mCurrentData;
-                        SmallInt                                *mStripsChanges;
+                        SmallInt        mTotalFaces;
+                        SmallInt        *mCurrentData;
+                        SmallInt        *mStripsChanges;
                         LODRegisterType *mCurrentRegLOD;
-                        SmallInt                                *mVertex;
+                        SmallInt        *mVertex;
+
+                        SmallInt        minFaces, maxFaces;
                 
                         //      Changes of Strips in LOD file (p).
@@ -145 +146 @@
                         ~LodStripsLibrary(void);
 
-                        /// Copy constructor
-                        //LodStripsLibrary(const LodStripsLibrary&);
-
-                        /// Assignment operator
-                        //LodStripsLibrary& operator =(const LodStripsLibrary&);
-
                         /// Returns the highest LOD.
                         uint32  MaxLod();
@@ -158 +153 @@
 
                         /// Returns de current LOD and changes to the specified LOD.
-                        virtual uint32  GoToLod(uint32);
+                        virtual void GoToLod(Real);
 
                         /// Establishes the new LOD range.
@@ -175 +170 @@
                         /// Returns the number of vertices of the lowest LOD.
                         uint32  MinVertices();
-
-/*                      //      (New)   Get the number of strips.
-                        uint32  GetStripCount() const;
-                        uint32  GetIndexCountByStrip(uint32) const;*/
         };
 }

GTP/trunk/Lib/Geom/shared/GTGeometry/include/GeoLodTreeLibrary.h

@@ -10 +10 @@
 #include "GeoLodObject.h"
 
-class Arbol;
 class Foliage;
-class Point3D;
 
 namespace Geometry
@@ -37 +35 @@
 
                 // funciones ya descritas en la API
-                uint32 GoToTrunkLod(uint32 newlod);
+/*              uint32 GoToTrunkLod(uint32 newlod);
                 uint32 MinTrunkLod(void) const;
                 uint32 MaxTrunkLod(void) const;
                 uint32 GoToFoliageLod(uint32 newlod);
                 uint32 MinFoliageLod(void) const;
-                uint32 MaxFoliageLod(void) const;
+                uint32 MaxFoliageLod(void) const;*/
+
+                void GoToTrunkLod(Real);
+                void GoToFoliageLod(Real);
 
                 // changes the lod of the entire object (trunk and leaves)
-                virtual uint32 GoToLod(uint32);
+                virtual void GoToLod(Real);
 
                 // new proposed functions
@@ -69 +70 @@
         private:
                 Geometry::LodStripsLibrary *trunk;
-                Arbol *arbol;
                 Foliage *foliage;