Changeset 1090 for GTP/trunk/Lib/Geom/shared/GeoTool

Timestamp:

07/06/06 20:20:06 (19 years ago)

Author:

gumbau

Message:

LodTreeLibrary? constructor now has 3 parameters.
The leaves submesh is calculated inside the constructor.

Location:

GTP/trunk/Lib/Geom/shared/GeoTool

Files:

• include/GeoMeshViewUI.h (modified) (1 diff)
• src/GeoMeshView.cpp (modified) (1 diff)
• src/GeoMeshViewUI.cpp (modified) (4 diffs)

GTP/trunk/Lib/Geom/shared/GeoTool/include/GeoMeshViewUI.h

@@ -374 +374 @@
         void    setLodStripsLibrary(const Geometry::LodStripsLibraryData *, Mesh        *geomesh);
         //      Initialize the lodtreelibrary for visualization.
-        void    setLodTreesLibrary(const Geometry::LodStripsLibraryData *, const Geometry::TreeSimplificationSequence *, Mesh   *geomesh, uint32 ileafSubMesh);
+        void    setLodTreesLibrary(const Geometry::LodStripsLibraryData *, const Geometry::TreeSimplificationSequence *, Mesh   *geomesh/*, uint32 ileafSubMesh*/);
 
         // Indentify the mesh of leaves.

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshView.cpp

@@ -1032 +1032 @@
         for (int submesh = 0; submesh < geoMesh->mSubMeshCount; submesh++)
         {
-                if (submesh==leavesSubMesh)
+                //if (submesh==leavesSubMesh)
+                if (submesh == lodTreeLib->GetLeavesSubMesh())
                         continue;
 

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshViewUI.cpp

@@ -852 +852 @@
                 if (geoMeshLoader->GetTreeSimpSeq() && geoMeshLoader->GetLodStripsData())
                 {
-                        // select the first triangle-list submesh as leaves submesh
+/*                      // select the first triangle-list submesh as leaves submesh
                         int leafsSubMeshID = -1;
 
@@ -862 +862 @@
                                         break;
                                 }
-                        }
-
-                        setLodTreesLibrary(geoMeshLoader->GetLodStripsData(), geoMeshLoader->GetTreeSimpSeq(), mGeoMesh, leafsSubMeshID);
+                        }*/
+
+                        setLodTreesLibrary(geoMeshLoader->GetLodStripsData(), geoMeshLoader->GetTreeSimpSeq(), mGeoMesh/*, leafsSubMeshID*/);
 
                         //      Sets the aplication mode.
@@ -2342 +2342 @@
 //      Initialize the lodTreelibrary for visualization.
 //---------------------------------------------------------------------------
-void    GeoMeshViewUI::setLodTreesLibrary(const LodStripsLibraryData *lodstripsdata, const TreeSimplificationSequence *treesimpseq, Mesh *geomesh, uint32 ileafSubMesh)
+void    GeoMeshViewUI::setLodTreesLibrary(const LodStripsLibraryData *lodstripsdata, const TreeSimplificationSequence *treesimpseq, Mesh *geomesh/*, uint32 ileafSubMesh*/)
 {
         //      If there is no lod strips object.
@@ -2350 +2350 @@
         //      New lod strips object.
 
-        lodTreeLib = new Geometry::LodTreeLibrary(lodstripsdata,treesimpseq,geomesh,ileafSubMesh);
+        lodTreeLib = new Geometry::LodTreeLibrary(lodstripsdata,treesimpseq,geomesh/*,ileafSubMesh*/);
 
         //      Sets the slider range.