manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
ganovelli 2005-06-30 10:32:21 +00:00
parent 0c7caf4a75
commit 7df3a00426
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wrap/io_tetramesh/import_ts.h
View File

@ -21,11 +21,14 @@ class ImporterTS{
static FILE *& F(){static FILE * f; return f;} static FILE *& F(){static FILE * f; return f;}
inline static ReadPos( Point3<ScalarType> &p){ inline static ReadPos( Point3<double> &p){
fscanf(F(),"%g %g %g\n",&p[0],&p[1],&p[2]); fscanf(F(),"%lg %lg %lg",&p[0],&p[1],&p[2]);
}
inline static ReadPos( Point3<float> &p){
fscanf(F(),"%f %f %f",&p[0],&p[1],&p[2]);
} }
inline static ReadPos( Point4<ScalarType> &p){ inline static ReadPos( Point4<ScalarType> &p){
fscanf(F(),"%g %g %g %g\n",&p[0],&p[1],&p[2],&p[3]); fscanf(F(),"%g %g %g %g",&p[0],&p[1],&p[2],&p[3]);
} }
public: public:
static int Open( Tetramesh & m, const char * filename ) static int Open( Tetramesh & m, const char * filename )
@ -47,6 +50,8 @@ static int Open( Tetramesh & m, const char * filename )
{ {
fscanf(F(), "%i", &nvertex ); fscanf(F(), "%i", &nvertex );
fscanf(F(), "%i", &ntetra ); fscanf(F(), "%i", &ntetra );
m.tetra.reserve(ntetra);
m.vert.reserve(nvertex);
int j; int j;
for (j=0;j<nvertex;j++) for (j=0;j<nvertex;j++)
{ {
@ -54,8 +59,6 @@ static int Open( Tetramesh & m, const char * filename )
ReadPos(m.vert.back().P()); ReadPos(m.vert.back().P());
m.vert.back().ClearFlags(); m.vert.back().ClearFlags();
} }
m.tetra.reserve(ntetra);
m.vert.reserve(nvertex);
for (j=0;j<ntetra;j++) for (j=0;j<ntetra;j++)
{ {
fscanf(F(), "%i", &tp0 ); fscanf(F(), "%i", &tp0 );