nimor changes

This commit is contained in:
ganovelli 2004-10-04 18:45:48 +00:00
parent ac77f4d7d9
commit 2bb477dd63
4 changed files with 20 additions and 19 deletions

View File

@ -9,16 +9,16 @@
//#include <tetrastats.h> //#include <tetrastats.h>
#include <myglwidget.h> #include "myglwidget.h"
MyTetraMesh TM; MyTetraMesh TM;
MyTetraMesh *tm; MyTetraMesh *tm;
TetraStats<MyTetraMesh> Stats; TetraStats<MyTetraMesh> Stats;
vcg::tetra::io::ImporterTS<MyTetraMesh> ImpTS; typedef vcg::tetra::io::ImporterTS<MyTetraMesh> ImpTS;
vcg::tetra::UpdateTetraTopology<MyTetraMesh::VertexContainer ,MyTetraMesh::TetraContainer > UT; typedef vcg::tetra::UpdateTetraTopology<MyTetraMesh::VertexContainer ,MyTetraMesh::TetraContainer > UT;
vcg::tetra::UpdateNormals<MyTetraMesh> UN; typedef vcg::tetra::UpdateNormals<MyTetraMesh> UN;
vcg::tetra::UpdateBounding<MyTetraMesh> UB; typedef vcg::tetra::UpdateBounding<MyTetraMesh> UB;
void openTetraMesh(const char* filename) void openTetraMesh(const char* filename)
@ -29,14 +29,15 @@ void openTetraMesh(const char* filename)
TM=MyTetraMesh(); TM=MyTetraMesh();
if (ext==".ts") if (ext==".ts")
ImpTS.Open(TM,filename); ImpTS::Open(TM,filename);
else else
vcg::tetra::io::ImporterPLY<MyTetraMesh> ::Open(TM,filename); vcg::tetra::io::ImporterPLY<MyTetraMesh> ::Open(TM,filename);
UT.TTTopology(TM.vert,TM.tetra); UT::TTTopology(TM.vert,TM.tetra);
UT.VTTopology(TM.vert,TM.tetra); UT::ClearVTTopology(TM.vert,TM.tetra);
UN.PerVertex(TM); UT::VTTopology(TM.vert,TM.tetra);
UB.Box(TM); UN::PerVertex(TM);
UB::Box(TM);
tm=&TM; tm=&TM;
Stats.SetTetraMesh(tm); Stats.SetTetraMesh(tm);
Stats.Update(); Stats.Update();

View File

@ -2,7 +2,7 @@
** Form implementation generated from reading ui file 'MainFrame.ui' ** Form implementation generated from reading ui file 'MainFrame.ui'
** **
** Created: Mon Oct 4 19:00:57 2004 ** Created: Mon Oct 4 19:00:57 2004
** by: The User Interface Compiler ($Id: mainframe.cpp,v 1.1 2004-10-04 18:01:36 ganovelli Exp $) ** by: The User Interface Compiler ($Id: mainframe.cpp,v 1.2 2004-10-04 18:45:48 ganovelli Exp $)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
****************************************************************************/ ****************************************************************************/
@ -10,7 +10,7 @@
#include "mainframe.h" #include "mainframe.h"
#include <qvariant.h> #include <qvariant.h>
#include <D:/TetraView/myglwidget.h> #include "myglwidget.h"
#include <qgroupbox.h> #include <qgroupbox.h>
#include <qpushbutton.h> #include <qpushbutton.h>
#include <qbuttongroup.h> #include <qbuttongroup.h>

View File

@ -1,4 +1,4 @@
#include <myglwidget.h> #include "myglwidget.h"
#include <vcg\space\tetra3.h> #include <vcg\space\tetra3.h>
#include <vcg\space\point3.h> #include <vcg\space\point3.h>
extern MyTetraMesh *tm; extern MyTetraMesh *tm;

View File

@ -1,10 +1,10 @@
#include <GL\glew.h> #include <GL/glew.h>
#include <qgl.h> #include <qgl.h>
#include <wrap\gl\glwraptetra.h> #include <wrap/gl/glwraptetra.h>
#include <wrap\gl\pick.h> #include <wrap/gl/pick.h>
#include <wrap\gui\trackball.h> #include <wrap/gui/trackball.h>
#include <myclasses.h> #include "myclasses.h"
#include <tetrastats.h> #include "tetrastats.h"