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

Timestamp:

04/26/06 16:00:29 (19 years ago)

Author:

gumbau

Message:

Added LodTreeLibrary? working only for trunks

Location:

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

Files:

• GeoLodStripsLibrary.h (modified) (2 diffs)
• GeoLodTreeLibrary.h (modified) (1 diff)

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

@@ -9 +9 @@
         *       @file   GeoLodStripsLibrary.h
 /*===========================================================================*/
+
+#ifndef _GEOLODSTRIPSLIBRARY
+#define _GEOLODSTRIPSLIBRARY
 
 #include        "GeoMesh.h"
@@ -150 +153 @@
 
                         //      (New)   Get the number of strips.
-                        uint32  GetStripCount();
+                        uint32  GetStripCount() const;
+                        uint32  GetIndexCountByStrip(uint32) const;
         };
 }
 
+
+#endif

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

@@ -1 @@
-#include "GeoBase.h"
+//#include <string>
+//#include <exception>
+//#include "vertexdata.h"
 
+#ifndef _GEOLODSTREELIBRARY
+#define _GEOLODSTREELIBRARY
+
+#include "GeoMesh.h"
+#include "GeoLodStripsLibrary.h"
+
+/*class LodStrip;
+class Arbol;
+class Foliage;
+class Point3D;
+*/
 namespace Geometry
-{
-        /// LodTreeLibrary interface class.
-        /** This module contains functions that handle the levels of detail of the input multiresolution trees.
-        For Any given resolution and object this module returns two thins: a set of triangle strips representing the trunk 
-        and the branches at that resolution, and a triangle list representing the leaves at the same resolution. 
-        \n\n
-
-Inputs:\n
-        - The module receives a file describing a multiresolution tree object.
-        .
-
-Outputs:\n
-        - The module returns a strip set that represents the level of deatil demanded for the trunk and a triangle list 
-        that representes the level of detail for leaves.
-        .
-
-        */
+{       
         class LodTreeLibrary
         {
         public:
-                /// Constructor, receives as a parameter the name of the file including the multiresolution object.
-                LodTreeLibrary (std::string);
+/*              LodTreeLibrary( const LodTreeLibrary &);
+                LodTreeLibrary(LodTreeLibrary*);*/
+                LodTreeLibrary( std::string trunkSimpSeqFile,
+                                                Geometry::Mesh *treeGeoMesh
+                                                /*,
+                                                std::string foliage_verts,
+                                                std::string foliage_leafs,
+                                                std::string foliage_simpl,
+                                                uint32 leafSubMeshID,
+                                                CREATEVERTEXDATAFUNC vdfun=NULL, 
+                                                CREATEINDEXDATAFUNC idfun=NULL,
+                                                CREATEMULTIINDEXDATAFUNC midfun=NULL*/); // throws a FileNotFound exception
+                ~LodTreeLibrary(void);
+                uint32 GetUniqueID(void) const { return  uniqueID; }
 
-                /// Destructor.
-                ~LodTreeLibrary (void);
+                // funciones ya descritas en la API
+                uint32 GoToTrunkLod(uint32 newlod);
+                uint32 MinTrunkLod(void) const;
+                uint32 MaxTrunkLod(void) const;
+/*              uint32 GoToFoliageLod(uint32 newlod);
+                uint32 MinFoliageLod(void) const;
+                uint32 MaxFoliageLod(void) const;*/
 
-                /// Copy constructor
-                //LodTreeLibrary(const LodTreeLibrary&);
+                // funciones nuevas propuestas
+//              uint32 Get_Trunk_VertexCount(void) const;
+//              uint32 Get_Trunk_MaxIndexCount(uint32 istrip) const;
+                uint32 CurrentLOD_Trunk_StripCount(void) const;
+//              uint32 CurrentLOD_Trunk_IndexCount(void) const;
+                uint32 CurrentLOD_Trunk_IndexCountByStrip(uint32 istrip) const;
+/*              const VertexData* Get_Trunk_VertexData(void) const;
+//              const MultiIndexData* CurrentLOD_Trunk_Indices(void) const;*/
 
-                /// Assignment operator
-                //LodTreeLibrary& operator =(const LodTreeLibrary&);
+//              uint32 Get_Foliage_VertexCount(void) const;
+//              uint32 Get_Foliage_MaxIndexCount(void) const;
+//              uint32 CurrentLOD_Foliage_IndexCount(void) const;
+/*              const IndexData* CurrentLOD_Foliage_Indices(void) const;
+                const VertexData* Get_Foliage_VertexData(void) const;
+*/
+//              Geometry::IndexData *trunk_all_indices;
+//              unsigned int *indices_offsets;
 
-                /// Returns the highest LOD of the foliage.
-                uint32 MaxFoliageLod();
+                const Geometry::SmallIntVector & GetStrip(uint32 istrip) const { return trunk->mStrips[istrip]; }
 
-                /// Returns the highest LOD of the trunk.
-                uint32 MaxTrunkLod();
-
-                /// Returns the lowest LOD of the foliage.
-                uint32 MinFoliageLod();
-
-                /// Returns the lowest LOD of the trunk.
-                uint32 MinTrunkLod();
-
-                /// Returns de current foliage LOD and changes to the specified LOD.
-                uint32 GoToFoliageLod(uint32);
-
-                /// Returns de current trunk LOD and changes to the specified LOD.
-                uint32 GoToTrunkLod(uint32);
-
-                /// Establishes the new LOD range.
-                /// Only the LODs in that range are stored and used.
-                void TrimFoliageByLod(uint32, uint32);
-
-                /// Establishes the new LOD range.
-                /// Only the LODs in that range are stored and used.
-                void TrimTrunkByLod(uint32, uint32);
-
-                /// Returns the number of triangles of the foliage at the highest LOD.
-                uint32 MaxFoliageFaces();
-
-                /// Returns the number of triangles of the trunk at the highest LOD.
-                uint32 MaxTrunkFaces();
-
-                /// Returns the number of triangles of the foliage at the lowest LOD.
-                uint32 MinFoliageFaces();
-
-                /// Returns the number of triangles of the trunk at the lowest LOD.
-                uint32 MinTrunkFaces();
-
-                /// Returns the number of vertices of the foliage at the highest LOD.
-                uint32 MaxFoliageVertices();
-
-                /// Returns the number of vertices of the trunk at the highest LOD.
-                uint32 MaxTrunkVertices();
-
-                /// Returns the number of vertices of the foliage at the lowest LOD.
-                uint32 MinFoliageVertices();
-
-                /// Returns the number of vertices of the trunk at the lowest LOD.
-                uint32 MinTrunkVertices();
+        private:
+                uint32 uniqueID;
+                Geometry::LodStripsLibrary *trunk;
+//              Arbol *arbol;
+//              Foliage *foliage;
 
         };
 }
+
+#endif