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

Timestamp:

09/28/06 17:49:37 (18 years ago)

Author:

gumbau

Message:

Updated modules to the new interface and the new simplification algorithm improvements.

Location:

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

Files:

• Leaf.cpp (modified) (3 diffs)
• VertexData.cpp (modified) (1 diff)
• foliage.cpp (modified) (13 diffs)
• foliage.h (modified) (4 diffs)

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

@@ -10 +10 @@
         vertsLeaf[0] = vertsLeaf[1] = vertsLeaf[2] = vertsLeaf[3] =0; 
         center[0] = center[1] = center[2] = 0;
-        normal[0] = normal[1] = normal[2] = 0;
+//      normal[0] = normal[1] = normal[2] = 0;
         leafNear=-1;
         parentLeafCount = 1;
@@ -40 +40 @@
         for ( int i=0;i<3;i++){
                 center[i] = aLeaf.center[i];
-                normal[i] = aLeaf.normal[i];
+//              normal[i] = aLeaf.normal[i];
         }
         for (i = 0L; i < 4; i++)
@@ -53 +53 @@
 
 
+RuntimeLeaf::RuntimeLeaf(void) 
+{       
+        vertsLeaf[0] = vertsLeaf[1] = vertsLeaf[2] = vertsLeaf[3] = 0;
+        parent = root = childLeft = childRight = -1;
+}
 
 //--------------------------------------------------------------------------------------------------------------------------------
-// Destructor. We must deallocate the memory allocated for pointers to vertices and edges
+// Copy constructor
 //--------------------------------------------------------------------------------------------------------------------------------
-Leaf::~Leaf (void)
+RuntimeLeaf::RuntimeLeaf (const RuntimeLeaf& aLeaf)
 {
+        for (int i = 0L; i < 4; i++)
+                vertsLeaf[i] = aLeaf.vertsLeaf[i]; 
+        parent = aLeaf.parent;
+        childLeft = aLeaf.childLeft;
+        childRight = aLeaf.childRight;
+        root = aLeaf.root;
 }
 

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

@@ -1 +1 @@
 #include "VertexData.h"
 
-Geometry::DefaultVertexData::DefaultVertexData(unsigned int numv):Geometry::VertexData(numv)
+/*
+void Geometry::DefaultIndexData::Init(unsigned int numi)
 {
-        v = new float[numv*3];
-        n = new float[numv*3];
-        t = new float[numv*2];
-}
-Geometry::DefaultVertexData::~DefaultVertexData(void)
-{
-/*      delete[] v;
-        delete[] n;
-        delete[] t;*/
-}
-
-Geometry::VertexData *Geometry::DefaultVertexDataCreator(unsigned int numv)
-{ 
-        return new DefaultVertexData(numv); 
-}
-
-
-Geometry::DefaultIndexData::DefaultIndexData(unsigned int numi):Geometry::IndexData(numi)
-{
-        indices = new unsigned int[numi];       
+        indices = new unsigned int[numi];
 }
 Geometry::DefaultIndexData::~DefaultIndexData(void)
 {
-/*      delete[] indices;*/
 }
 
 Geometry::IndexData *Geometry::DefaultIndexDataCreator(unsigned int numi)
 { 
-        return new DefaultIndexData(numi); 
+        IndexData *ret = new DefaultIndexData();
+//      ret->Init(numi);
+        return ret;
 }
 
-
-/*Geometry::DefaultMultiIndexData::DefaultMultiIndexData(unsigned int numprims, unsigned int *numi):Geometry::MultiIndexData(numprims,numi)
-{
-        indices = new unsigned int*[numprims];  
-        for (unsigned int i=0; i<numprims; i++)
-                indices[i]=new unsigned int[numi[i]];
-}
-Geometry::DefaultMultiIndexData::~DefaultMultiIndexData(void)
-{
-        for (unsigned int i=0; i<GetNumPrims(); i++)
-                delete[] indices[i];
-        delete[] indices;
-}
-
-Geometry::MultiIndexData *Geometry::DefaultMultiIndexDataCreator(unsigned int numprims, unsigned int *numi)
-{ 
-        return new DefaultMultiIndexData(numprims,numi); 
-}
 */

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

@@ -10 +10 @@
 // Parameters --> None
 //--------------------------------------------------------------------------------------------------------------------------------
-Foliage::Foliage(const Geometry::SubMesh *leavesSubMesh, const Geometry::TreeSimplificationSequence * simpSeq, Geometry::CREATEVERTEXDATAFUNC vdfun, Geometry::CREATEINDEXDATAFUNC idfun): 
+Foliage::Foliage(int leavessubmeshID, 
+                                 const Geometry::SubMesh *leavesSubMesh, 
+                                 const Geometry::TreeSimplificationSequence * simpSeq/*,
+                                 Geometry::CREATEVERTEXDATAFUNC vdfun*/): 
 Acth(NULL),
-create_vertex_data_func(vdfun==NULL?Geometry::DefaultVertexDataCreator:vdfun),
-create_index_data_func(idfun==NULL?Geometry::DefaultIndexDataCreator:idfun),
-vertexdata(NULL), Leaves(NULL), MinDet(NULL)
+//create_vertex_data_func(vdfun==NULL?Geometry::DefaultVertexDataCreator:vdfun),
+//create_index_data_func(idfun==NULL?Geometry::DefaultIndexDataCreator:idfun),
+/*vertexdata(NULL),*/ Leaves(NULL), MinDet(NULL)
 {
         begin = final = -1;
-
-        ReadVertices(leavesSubMesh);
+//      indexdata=NULL;
+
+//      ReadVertices(leavesSubMesh);
+        int countv= int(leavesSubMesh->mVertexBuffer->mVertexCount);
+        Leaves = new RuntimeLeaf[countv*2];
+        TotalVerts = countv;
+
         ReadLeafs(leavesSubMesh);
         if (!ReadSimpSeq(simpSeq)) exit(1);
         FillRoot();
-        CalculateTexCoordsAndNorms();
-
-        indexdata->SetNumValidIndices(0);
+//      CalculateTexCoordsAndNorms();
+
+//      indexdata->SetNumValidIndices(0);
 
         int h=0;
@@ -44 +52 @@
         final = leafCount-1;
         active_leaf_count = leafCount;
+        leavesSubMeshID=leavessubmeshID;
 }
 
@@ -51 +60 @@
 Foliage::~Foliage (void)
 {
-        if (vertexdata) delete vertexdata;
-        if (indexdata) delete indexdata;
+//      if (vertexdata) delete vertexdata;
+//      if (indexdata) delete indexdata;
         delete[] Leaves;
         delete MinDet;
@@ -222 +231 @@
 
  }
-
+/*
 void Foliage::ReadVertices(const Geometry::SubMesh *submesh)
 {
@@ -228 +237 @@
         vertexdata = create_vertex_data_func(2*countv);
         Leaves = new Leaf[countv*2];
-        indexdata = create_index_data_func(countv*2*3); // 3 indices x 2 triangulos x hoja
+        //indexdata = create_index_data_func(countv*2*3); // 3 indices x 2 triangulos x hoja
         
         vertexdata->Begin();
@@ -249 +258 @@
         float twox, twoy, twoz;
         float threex, threey, threez;
-
-/*      Vertices[aHoja.vertsLeaf[0]].GetCoordinates (onex, oney, onez);
-        Vertices[aHoja.vertsLeaf[1]].GetCoordinates(twox, twoy, twoz);
-        Vertices[aHoja.vertsLeaf[2]].GetCoordinates (threex, threey, threez);*/
 
         vertexdata->GetVertexCoord(aleaf.vertsLeaf[0],onex,oney,onez);
@@ -286 +291 @@
         res[2]=v[2]/module;
 }
-
+*/
 void Foliage::ReadLeafs(const Geometry::SubMesh *submesh)
 {
@@ -297 +302 @@
                 Leaves[h].vertsLeaf[2] = submesh->mIndex[h*6+2];
                 Leaves[h].vertsLeaf[3] = submesh->mIndex[h*6+5];
-                Leaves[h].visible = 0;
-
-                GetNormalH ( Leaves[h]);
+//              Leaves[h].visible = 0;
+
+//              GetNormalH ( Leaves[h]);
         }
 }
@@ -316 +321 @@
                 Leaves[tn].vertsLeaf[3] = it->mNewQuad[3];
 
-                Leaves[tn].visible = 0;
-
-                GetNormalH  (Leaves[tn]);
+//              Leaves[tn].visible = 0;
+
+//              GetNormalH  (Leaves[tn]);
 
                 tv1 = it->mV0/2;
@@ -433 +438 @@
 }
 
-void Foliage::CalculateTexCoordsAndNorms(void)
+/*void Foliage::CalculateTexCoordsAndNorms(void)
 {       
         vertexdata->Begin();
@@ -453 +458 @@
         vertexdata->End();
 }
-
+*/
 Foliage::Foliage(const Foliage *ar)
 {
@@ -465 +470 @@
         TotalVerts=ar->TotalVerts;
 
-        create_vertex_data_func=ar->create_vertex_data_func;
-        create_index_data_func=ar->create_index_data_func;
+/*      create_vertex_data_func=ar->create_vertex_data_func;
+//      create_index_data_func=ar->create_index_data_func;
         vertexdata=create_vertex_data_func(ar->vertexdata->GetNumVertices());
         vertexdata->Begin(); 
@@ -477 +482 @@
                 vertexdata->SetVertexNormal(i,va,vb,vc);
         }
-        vertexdata->End();
-        indexdata=create_index_data_func(ar->indexdata->GetNumMaxIndices());
-        indexdata->Begin(); 
+        vertexdata->End();*/
+/*      indexdata=create_index_data_func(ar->indexdata->GetNumMaxIndices());
+        indexdata->Begin(ar->leavesSubMeshID,indexdata->GetNumMaxIndices());
         for (unsigned int i=0; i<indexdata->GetNumMaxIndices(); i++) 
                 indexdata->SetIndex(i,ar->indexdata->GetIndex(i));
-        indexdata->End();
-
-        Leaves=new Leaf[vertexdata->GetNumVertices()];
+        indexdata->End();*/
+
+        Leaves=new RuntimeLeaf[TotalVerts];
 //      for (unsigned int i=0; i<vertexdata->GetNumVertices(); i++) 
 //              Leaves[i]=ar->Leaves[i];
-        memcpy(Leaves,ar->Leaves,sizeof(Leaf)*vertexdata->GetNumVertices());
+        memcpy(Leaves,ar->Leaves,sizeof(Leaf)*TotalVerts);
 
         // esto no sé si devería haber akí
-        indexdata->SetNumValidIndices(0);
+//      indexdata->SetNumValidIndices(0);
 
         int h=0;

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

@@ -26 +26 @@
                 int begin, final;
                 int active_leaf_count;
+                int leavesSubMeshID;
 
-                Foliage (const Geometry::SubMesh *, const Geometry::TreeSimplificationSequence *, Geometry::CREATEVERTEXDATAFUNC vdfun=NULL, Geometry::CREATEINDEXDATAFUNC idfun=NULL);
+                Foliage (       int leavesSubMeshID, 
+                                        const Geometry::SubMesh *, 
+                                        const Geometry::TreeSimplificationSequence *    );
+
                 Foliage (const Foliage *);
                 virtual ~Foliage (void); // Destructor
@@ -33 +37 @@
                 void CalculateLOD(int nhojas);
 
-                Geometry::VertexData *vertexdata;
-                Geometry::IndexData *indexdata;
-
-                Leaf   *Leaves;
+                RuntimeLeaf   *Leaves;
                 ActiveLeafNode  *MinDet; // first active leaf
                 int leafCount;
@@ -45 +46 @@
 
         private:
-                Geometry::CREATEVERTEXDATAFUNC create_vertex_data_func;         
-                Geometry::CREATEINDEXDATAFUNC create_index_data_func;
 
                 bool IsActive( int num) const;
@@ -59 +58 @@
                 bool ReadSimpSeq(const Geometry::TreeSimplificationSequence *); /// returns true when successful
                 void FillRoot(void);
-
-                void GetNormalH (Leaf&);
-
-                void CrossProduct(const float *v1, const float *v2, float *res);
-                void Normalize(const float *v, float *res);
-//              void CalculaNormalesVertice(void);
-                void CalculateTexCoordsAndNorms(void);
-
 };