Changeset 1078 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/leaves

Timestamp:

07/05/06 17:15:14 (19 years ago)

Author:

gumbau

Message:

Extended Mesh implementation

Location:

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/leaves

Files:

• foliage.cpp (modified) (3 diffs)
• foliage.h (modified) (3 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/leaves/foliage.cpp

@@ -10 +10 @@
 // Parameters --> None
 //--------------------------------------------------------------------------------------------------------------------------------
-Foliage::Foliage(const Geometry::SubMesh *leavesSubMesh, const char *simpSeq, Geometry::CREATEVERTEXDATAFUNC vdfun, Geometry::CREATEINDEXDATAFUNC idfun): 
+Foliage::Foliage(const Geometry::SubMesh *leavesSubMesh, const Geometry::TreeSimplificationSequence & simpSeq, Geometry::CREATEVERTEXDATAFUNC vdfun, Geometry::CREATEINDEXDATAFUNC idfun): 
 Acth(NULL),
 create_vertex_data_func(vdfun==NULL?Geometry::DefaultVertexDataCreator:vdfun),
@@ -304 +304 @@
 
 /// returns the number of total leafs
-bool Foliage::ReadSimpSeq(const char *simpSeqFile)
-{
-        FILE* fp_simpli;
+bool Foliage::ReadSimpSeq(const Geometry::TreeSimplificationSequence & simpSeq)
+{
+        int tn, tv1,tv2, e=0;
+
+        tn = leafCount;
+        for (std::vector<Geometry::TreeSimplificationSequence::Step>::const_iterator it = simpSeq.mSteps.begin(); it != simpSeq.mSteps.end(); it++)
+        {
+                Leaves[tn].vertsLeaf[0] = it->mNewQuad[0];
+                Leaves[tn].vertsLeaf[1] = it->mNewQuad[1];
+                Leaves[tn].vertsLeaf[2] = it->mNewQuad[2];
+                Leaves[tn].vertsLeaf[3] = it->mNewQuad[3];
+
+                Leaves[tn].visible = 0;
+
+                GetNormalH  (Leaves[tn]);
+
+                tv1 = it->mV0/2;
+                tv2 = it->mT0/2;
+
+                Leaves[tn].childLeft= tv1;
+                Leaves[tn].childRight= tv2;
+
+                Leaves[tv1].parent = tn;
+                Leaves[tv2].parent = tn;                
+
+                tn++;
+        }
+
+/*      FILE* fp_simpli;
         char linea[256];
         int v0, v1, v2, v3, tn, tv1,tv2, e=0;
@@ -350 +376 @@
         }
 
-        fclose(fp_simpli);
+        fclose(fp_simpli);*/
 
         leafTotal=tn;

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/leaves/foliage.h

@@ -6 +6 @@
 #include "VertexData.h"
 #include "Leaf.h"
+#include "GeoTreeSimpSequence.h"
 
 class ActiveLeafNode
@@ -26 +27 @@
                 int active_leaf_count;
 
-                Foliage (const Geometry::SubMesh *, const char *simpSeq, Geometry::CREATEVERTEXDATAFUNC vdfun=NULL, Geometry::CREATEINDEXDATAFUNC idfun=NULL);
+                Foliage (const Geometry::SubMesh *, const Geometry::TreeSimplificationSequence &, Geometry::CREATEVERTEXDATAFUNC vdfun=NULL, Geometry::CREATEINDEXDATAFUNC idfun=NULL);
                 Foliage (const Foliage *);
                 virtual ~Foliage (void); // Destructor
@@ -56 +57 @@
                 void ReadLeafs(const Geometry::SubMesh *);
                 void ReadVertices(const Geometry::SubMesh *);
-                bool ReadSimpSeq(const char*); /// returns true when successful
+                bool ReadSimpSeq(const Geometry::TreeSimplificationSequence &); /// returns true when successful
                 void FillRoot(void);