Corrected gcc compiling issues

This commit is contained in:
Paolo Cignoni 2007-05-17 09:39:42 +00:00
parent 1f317f011f
commit 558f9baddc
3 changed files with 13 additions and 7 deletions

View File

@ -24,6 +24,9 @@
History
$Log: not supported by cvs2svn $
Revision 1.4 2007/05/17 09:06:44 ganovelli
gestione double click
Revision 1.3 2006/12/10 23:29:57 ganovelli
added VFIterator (Pos is disabled in this version)
@ -37,6 +40,7 @@ cvs problem during frist committ. repeated
#include <QtOpenGL>
#include <math.h>
#include "glwidget.h"
#include <wrap/io_trimesh/import_PLY.h>
#include <wrap/gl/picking.h>
#include <wrap/gl/space.h>
@ -45,7 +49,6 @@ cvs problem during frist committ. repeated
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/topology.h>
#include "glwidget.h"
GLWidget::GLWidget(QWidget *parent)
: QGLWidget(parent)
@ -181,7 +184,7 @@ void GLWidget::paintGL()
if(yes)
{vp = res[0];
MyStraightMesh::FaceType* g = vp->VFp();
vfite=vcg::face::VFIterator<typename MyStraightMesh::FaceType>(vp);
vfite=vcg::face::VFIterator<MyStraightMesh::FaceType>(vp);
}
doPickVfIte = false;

View File

@ -24,6 +24,9 @@
History
$Log: not supported by cvs2svn $
Revision 1.4 2007/05/17 09:06:44 ganovelli
gestione double click
Revision 1.3 2006/12/10 23:29:57 ganovelli
added VFIterator (Pos is disabled in this version)
@ -58,8 +61,8 @@ public:
vcg::Trackball track;
int ScreenH,ScreenW,pic_x,pic_y,keypress;
bool doPickPos,doPickVfIte;
vcg::face::Pos<typename MyStraightMesh::FaceType> pos;
vcg::face::VFIterator<typename MyStraightMesh::FaceType> vfite;
vcg::face::Pos< MyStraightMesh::FaceType> pos;
vcg::face::VFIterator< MyStraightMesh::FaceType> vfite;
public slots:
void flipV( );

View File

@ -1,12 +1,12 @@
INCLUDEPATH += . ../../.. ../../../../code/lib
INCLUDEPATH += . ../../.. ../../../../code/lib ../../../../code/lib/glew/include
HEADERS = glwidget.h \
window.h \
mesh_type
mesh_type.h
SOURCES = glwidget.cpp \
main.cpp \
window.cpp\
../../../../code/lib/glew/src/glew.c \
../../../wrap/ply/plylib.cpp\
../../../wrap/gui/trackball.cpp\
../../../wrap/gui/trackmode.cpp\
../../../wrap/gui/trackball.cpp
QT += opengl