Changeset 831 for GTP/trunk/Lib/Geom/shared/GTGeometry/src

Timestamp:

04/26/06 18:17:10 (19 years ago)

Author:

gumbau

Message:

 

Location:

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

Files:

• GeoLodTreeLibrary.cpp (modified) (10 diffs)
• libs/leaves/Arbol.cpp (modified) (2 diffs)
• libs/leaves/VertexData.cpp (added)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoLodTreeLibrary.cpp

@@ -2 +2 @@
 #include <assert.h>
 #include "GeoLodTreeLibrary.h"
-//#include "ArbolesInma/Arbol.h"
-//#include "ArbolesInma/Foliage.h"
+#include "libs/leaves/arbol.h"
+#include "libs/leaves/Foliage.h"
 
 using namespace Geometry;
@@ -10 +10 @@
 
 Geometry::LodTreeLibrary::LodTreeLibrary(std::string trunkSimpSeqFile,
-                                                           Geometry::Mesh *treeGeoMesh 
-                                                           /*,
+                                                           Geometry::Mesh *treeGeoMesh,
                                                            std::string foliage_verts, 
                                                            std::string foliage_leafs, 
-                                                           std::string foliage_simpl,
+                                                           std::string foliage_simpl/*,
                                                            uint32 leafSubMeshID,
                                                            CREATEVERTEXDATAFUNC vdfun,
@@ -23 +22 @@
 
         // Cargar el tronco
-/*      trunk=new LodStrip(vdfun,midfun);
-        trunk->ED_NUEVA=1;
-        trunk->RESVARIABLE=0;
-        trunk->MODOTEST=0; //0: No test 1: plano  2: esfera
-        trunk->bTextures=0;
-        if (trunk->RecuperarModeloEFFICIENT((char*)trunkfile.c_str())==0)
-                throw FileNotFound(trunkfile);
-
-//      trunk->LodsDisp=(int) (trunk->cVerts.size()*0.99);
-        trunk->LodsDisp=(int) (trunk->TOTALCAMBIOS*0.95);
-        trunk->CopiarVectors2ArraysNUEVAED();
-        trunk->LodActual=0;
-        trunk->CalculaNormalesVertice();*/
-
         trunk = new LodStripsLibrary(trunkSimpSeqFile,treeGeoMesh);
 
         // Cargar la copa del árbol
-/*      arbol = new Arbol(foliage_verts.c_str(),foliage_leafs.c_str(),foliage_simpl.c_str(),vdfun,idfun);
-        foliage = new Foliage(arbol);*/
-
+        arbol = new Arbol(foliage_verts.c_str(),foliage_leafs.c_str(),foliage_simpl.c_str(),NULL/*vdfun*/,NULL/*idfun*/);
+        foliage = new Foliage(arbol);
 }
 /*
@@ -66 +50 @@
 {
         if (trunk) delete trunk;
-//      if (arbol) delete arbol;
-//      if (foliage) delete foliage;
+        if (arbol) delete arbol;
+        if (foliage) delete foliage;
 /*      if (trunk_all_indices) delete trunk_all_indices;
         if (indices_offsets) delete[] indices_offsets;
@@ -117 +101 @@
 }
 
-/*
+
 uint32 LodTreeLibrary::GoToFoliageLod(uint32 newlod)
 {
@@ -174 +158 @@
         return arbol->nHojas;
 }
-*/
+
 /*const VertexData* LodTreeLibrary::Get_Trunk_VertexData(void) const 
 { 
@@ -191 +175 @@
         return arbol->vertexdata;
 }
-
+*/
 const IndexData* LodTreeLibrary::CurrentLOD_Foliage_Indices(void) const
 {
 //      return current_foliage_indices;
         return arbol->indexdata;
-}*/
+}
 
 
@@ -203 +187 @@
         throw Geometry::FileNotFound(text);
 }*/
-/*
+
 uint32 LodTreeLibrary::CurrentLOD_Foliage_IndexCount(void) const
 {
@@ -209 +193 @@
         return arbol->indexdata->GetNumValidIndices();
 }
-
+/*
 uint32 LodTreeLibrary::Get_Trunk_VertexCount(void) const
 {
@@ -224 +208 @@
 {
         return arbol->vertexdata->GetNumVertices();
-}
+}*/
 uint32 LodTreeLibrary::Get_Foliage_MaxIndexCount(void) const
 {
         return arbol->indexdata->GetNumMaxIndices();
 }
-*/

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

@@ -1 @@
-#include <GL\glut.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
 #include "Arbol.h"
-#include "../defs.h"
-
-//--------------------------------------------------------------------------------------------------------------------------------
-// Void constructor
-// Parameters --> None
-//--------------------------------------------------------------------------------------------------------------------------------
-/*Arbol::Arbol(void):  Vertices(NULL), Hojas(NULL)
-{
-        cx = cy= cz=0;
-}*/
+
 //--------------------------------------------------------------------------------------------------------------------------------
 // Constructor with the name of a file cotaining the data
@@ -51 +41 @@
             
         //VERTICES
-        if ((TotVerts=LeeVertices(arbol))==0) ThrowFileNotFoundError((const char*)arbol);
-        if ((nHojas = LeoHojas (hojas))==0) ThrowFileNotFoundError((const char*)hojas);
+        if ((TotVerts=LeeVertices(arbol))==0){ printf("File not found '%s'\n",arbol); exit(1); }//ThrowFileNotFoundError((const char*)arbol);
+        if ((nHojas = LeoHojas (hojas))==0) { printf("File not found '%s'\n",hojas); exit(1); }//ThrowFileNotFoundError((const char*)hojas);
 //      TotTronco = LeoTronco (tronco);
 //      CalculaNormalesVertice();       
-        if ((TotHojas = LeoHojasSimpl(simpli))==0) ThrowFileNotFoundError((const char*)simpli); 
+        if ((TotHojas = LeoHojasSimpl(simpli))==0){ printf("File not found '%s'\n",simpli); exit(1); }// ThrowFileNotFoundError((const char*)simpli);   
         RellenoRaiz();