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

Timestamp:

06/16/06 16:56:05 (18 years ago)

Author:

gumbau

Message:

Improved Foliage class

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/leaves/foliage.h (modified) (4 diffs)

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

@@ -3 +3 @@
 
 
-#include "arbol.h"
 #include "Activas.h"
-//#include "material.h"
+#include "GeoSubMesh.h"
 #include "tlista.h"
-//#include <vl\VLf.h>
 #include "TMatrix.h"
-
-
+#include "VertexData.h"
+#include "Leaf.h"
 
 class Foliage
@@ -16 +14 @@
         public :
 
-        Arbol    *MiArbol;
-        Activas  *Acth; // primera hoja activa
-        int ppio, final;
-        int nhactivas;
-        TMatrix mat_aux;
+                Activas  *Acth; // primera hoja activa
+                int ppio, final;
+                int nhactivas;
+                TMatrix mat_aux;
 
-        public :
-                Foliage (void); // Void constructor
-                Foliage ( Arbol* Arbol1 ); // Constructor with the name of a file cotaining the data
+                Foliage (const Geometry::SubMesh *, const char *simpSeq, Geometry::CREATEVERTEXDATAFUNC vdfun=NULL, Geometry::CREATEINDEXDATAFUNC idfun=NULL);
+                Foliage (const Foliage *);
                 virtual ~Foliage (void); // Destructor
                 
-                // sacar por pantalla
-/*              void Dibuja_Hoja ( Hoja&);
-                int  DibujarHojas (float frustum[6][4], float zoom);
-                void DibujaEsfera (float);*/
-
                 //culling
                 void Culling (float frustum[6][4]);
@@ -39 +30 @@
                 bool EsActivo (  int num);
                 int  DondeEsta (  float x, float y, float z, float rva, float rvb,float rvc, float rvd);
-                bool Criterio ( Hoja &aHoja, char ch, float rva, float rvb,float rvc, float rvd, float radio);
+                bool Criterio ( Leaf &, char ch, float rva, float rvb,float rvc, float rvd, float radio);
                 int  ResolucionV ( char c, float rva, float rvb,float rvc, float rvd, float radio);
                 void ColapsaHoja (int, int&);
@@ -56 +47 @@
                 void RCsplit (  int nhojas);
 
-                //impostores
-//              void DibujaCaja (float alfa, float d);
-//              int  DibujaMediaCopa ( char c, float rva, float rvb,float rvc, float rvd, float radio);
+                Geometry::VertexData *vertexdata;
+                Geometry::IndexData *indexdata;
+
+                Leaf   *Leaves;
+                Activas  *MinDet; // primera hoja activa
+                int nHojas;
+                int TotHojas;
                 
+                float cx,cy,cz; //centro de la copa// para los impostores y resolucion variable
+                float rad; //radio de la esfera envolvente
+                int minHojas;
+                int TotVerts;
+
+        private:
+                Geometry::CREATEVERTEXDATAFUNC create_vertex_data_func;         
+                Geometry::CREATEINDEXDATAFUNC create_index_data_func;
+
+                void ReadLeafs(const Geometry::SubMesh *);
+                void ReadVertices(const Geometry::SubMesh *);
+                bool ReadSimpSeq(const char*); /// returns true when successful
+                void RellenoRaiz (void);
+
+                void GetNormalH (Leaf&);
+//              void GetNormalT(Tronco&);
+
+                void CrossProduct(const float *v1, const float *v2, float *res);
+                void Normalize(const float *v, float *res);
+//              void CalculaNormalesVertice(void);
+                void CalculaTexCoordsYNorms(void);
+
 };