Changeset 1056 for GTP/trunk

Timestamp:

06/26/06 11:42:59 (19 years ago)

Author:

gumbau

Message:

GeoLodObject? added as a parent class for GeoLodStripsLibrary? and GeoLodTreeLibrary?

Location:

GTP/trunk/Lib/Geom/shared/GTGeometry

Files:

• GTGeometry.vcproj (modified) (1 diff)
• include/GeoLodObject.h (added)
• include/GeoLodStripsLibrary.h (modified) (3 diffs)
• include/GeoLodTreeLibrary.h (modified) (5 diffs)
• src/GeoLodTreeLibrary.cpp (modified) (2 diffs)

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

@@ -360 +360 @@
                         </File>
                         <File
+                                RelativePath=".\include\GeoLodObject.h">
+                        </File>
+                        <File
                                 RelativePath=".\include\GeoLodStripsConstructor.h">
                         </File>

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

@@ -17 +17 @@
 #include        <time.h>
 #include        "VertexData.h"
+#include "GeoLodObject.h"
 
 namespace Geometry
@@ -70 +71 @@
 
         */
-        class LodStripsLibrary
+        class LodStripsLibrary : public Geometry::LodObject
         {
                 private:
@@ -157 +158 @@
 
                         /// Returns de current LOD and changes to the specified LOD.
-                        uint32  GoToLod(uint32);
+                        virtual uint32  GoToLod(uint32);
 
                         /// Establishes the new LOD range.

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

@@ -8 +8 @@
 #include "GeoMesh.h"
 #include "GeoLodStripsLibrary.h"
+#include "GeoLodObject.h"
 
 class Arbol;
@@ -17 +18 @@
         class IndexData;
         class VertexData;
-        class LodTreeLibrary
+        class LodTreeLibrary : public Geometry::LodObject
         {
         public:
@@ -34 +35 @@
                                                 CREATEMULTIINDEXDATAFUNC midfun=NULL*/); // throws a FileNotFound exception
                 ~LodTreeLibrary(void);
-                uint32 GetUniqueID(void) const { return  uniqueID; }
 
                 // funciones ya descritas en la API
@@ -43 +43 @@
                 uint32 MinFoliageLod(void) const;
                 uint32 MaxFoliageLod(void) const;
+
+                // changes the lod of the entire object (trunk and leaves)
+                virtual uint32 GoToLod(uint32);
 
                 // new proposed functions
@@ -65 +68 @@
 
         private:
-                uint32 uniqueID;
                 Geometry::LodStripsLibrary *trunk;
                 Arbol *arbol;

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

@@ -5 +5 @@
 
 using namespace Geometry;
-
-uint32 uniqueIDgen = 0;
 
 Geometry::LodTreeLibrary::LodTreeLibrary(std::string trunkSimpSeqFile,
@@ -20 +18 @@
                                                            CREATEMULTIINDEXDATAFUNC midfun*/)
 {
-        uniqueID = uniqueIDgen++;
-
         // Cargar el tronco
         trunk = new LodStripsLibrary(trunkSimpSeqFile,treeGeoMesh);