cvs problem during frist committ. repeated
This commit is contained in:
parent
ebfacd2db3
commit
cbe27a6f0e
|
@ -70,9 +70,9 @@ QSize GLWidget::sizeHint() const
|
||||||
return QSize(400, 400);
|
return QSize(400, 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLWidget::LoadTriMesh( char* namefile)
|
void GLWidget::LoadTriMesh(QString &namefile)
|
||||||
{
|
{
|
||||||
vcg::tri::io::ImporterPLY<MyStraightMesh>::Open(mesh,namefile);
|
vcg::tri::io::ImporterPLY<MyStraightMesh>::Open(mesh,namefile.toAscii());
|
||||||
vcg::tri::UpdateBounding<MyStraightMesh>::Box(mesh);
|
vcg::tri::UpdateBounding<MyStraightMesh>::Box(mesh);
|
||||||
vcg::tri::UpdateNormals<MyStraightMesh>::PerFace(mesh);
|
vcg::tri::UpdateNormals<MyStraightMesh>::PerFace(mesh);
|
||||||
vcg::tri::UpdateNormals<MyStraightMesh>::PerVertex(mesh);
|
vcg::tri::UpdateNormals<MyStraightMesh>::PerVertex(mesh);
|
||||||
|
@ -88,7 +88,7 @@ void GLWidget::OpenFile(){
|
||||||
|
|
||||||
if (fileName.isEmpty()) return;
|
if (fileName.isEmpty()) return;
|
||||||
else
|
else
|
||||||
LoadTriMesh((char*)fileName.data());
|
LoadTriMesh( fileName );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ public slots:
|
||||||
void flipE( );
|
void flipE( );
|
||||||
void flipF( );
|
void flipF( );
|
||||||
void nextE( );
|
void nextE( );
|
||||||
void LoadTriMesh( char* namefile);
|
void LoadTriMesh(QString& namefile);
|
||||||
void OpenFile();
|
void OpenFile();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
@ -52,7 +52,6 @@ Window::Window()
|
||||||
mainLayout->addWidget(ldButton);
|
mainLayout->addWidget(ldButton);
|
||||||
setLayout(mainLayout);
|
setLayout(mainLayout);
|
||||||
|
|
||||||
glWidget->LoadTriMesh("torus.ply");
|
|
||||||
glWidget->glWrap.m = &glWidget->mesh;
|
glWidget->glWrap.m = &glWidget->mesh;
|
||||||
|
|
||||||
setWindowTitle(tr("TriMesh Pos Demo"));
|
setWindowTitle(tr("TriMesh Pos Demo"));
|
||||||
|
|
Loading…
Reference in New Issue