lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-18 10:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

gla now is a local variable used only if needed

Browse Source 
texture button now works properly
This commit is contained in:
Paolo Cignoni cignoni 2005-12-04 14:45:30 +00:00
parent 43615a4a61
commit 17b856cd99
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/meshlab/mainwindow.h
View File

@ -23,6 +23,10 @@
/****************************************************************************
History
$Log$
Revision 1.40 2005/12/04 14:45:30 glvertex
gla now is a local variable used only if needed
texture button now works properly
Revision 1.39 2005/12/04 02:44:39 davide_portelli
Added texture icon in toolbar
@ -128,7 +132,6 @@ private:
QWorkspace *workspace;
QSignalMapper *windowMapper;
GLArea *GLA(){return qobject_cast<GLArea *>(workspace->activeWindow()); }
GLArea *gla;
QDir pluginsDir;
QStringList pluginFileNames;

6
src/meshlab/mainwindow_Init.cpp
View File

@ -24,6 +24,10 @@
History
$Log$
Revision 1.12 2005/12/04 14:45:30 glvertex
gla now is a local variable used only if needed
texture button now works properly
Revision 1.11 2005/12/04 02:44:39 davide_portelli
Added texture icon in toolbar
@ -324,7 +328,7 @@ void MainWindow::createActions()
renderModeTextureAct = new QAction(QIcon(":/images/textures.png"),tr("&Texture"),this);
renderModeTextureAct->setCheckable(true);
renderModeTextureAct->setChecked(true);
renderModeTextureAct->setChecked(false);
connect(renderModeTextureAct, SIGNAL(triggered()), this, SLOT(renderTexture()));
setLightAct = new QAction(QIcon(":/images/lighton.png"),tr("&Light on/off"),this);

21
src/meshlab/mainwindow_RunTime.cpp
View File

@ -24,6 +24,10 @@
History
$Log$
Revision 1.16 2005/12/04 14:45:30 glvertex
gla now is a local variable used only if needed
texture button now works properly
Revision 1.15 2005/12/04 11:49:40 glvertex
solved some little bugs
now texture button works (not always correct: TO FIX)
@ -329,6 +333,7 @@ void MainWindow::updateMenus()
showInfoPaneAct->setChecked(GLA()->isInfoAreaVisible());
showTrackBallAct->setChecked(GLA()->isTrackBallVisible());
backFaceCullAct->setChecked(GLA()->getCurrentRenderMode().BackFaceCull);
renderModeTextureAct->setEnabled(!GLA()->mm->cm.textures.empty());
renderModeTextureAct->setChecked(GLA()->getCurrentRenderMode().textureMode != GLW::TMNone);
setLightAct->setIcon(rm.Lighting ? QIcon(":/images/lighton.png") : QIcon(":/images/lightoff.png") );
@ -426,7 +431,7 @@ void MainWindow::applyImportExport()
if (GLA() == NULL)
{
MeshModel *mm= new MeshModel();
gla = new GLArea(workspace);
GLArea *gla = new GLArea(workspace);
QString fileName;
// OLD VERSION
@ -525,19 +530,31 @@ void MainWindow::open(QString fileName)
//return;
}
else{
GLArea *gla;
//VM.push_back(nm);
gla=new GLArea(workspace);
gla->mm=nm;
gla->setWindowTitle(QFileInfo(fileName).fileName());
workspace->addWindow(gla);
if(workspace->isVisible()) gla->showMaximized();
else QTimer::singleShot(00, gla, SLOT(showMaximized()));
//else QTimer::singleShot(0, gla, SLOT(showMaximized()));
setCurrentFile(fileName);
//return;
}
qb->hide();
}
// Is this the correct place??
renderModeTextureAct->setChecked(false);
renderModeTextureAct->setEnabled(false);
if(!GLA()->mm->cm.textures.empty())
{
renderModeTextureAct->setChecked(true);
renderModeTextureAct->setEnabled(true);
GLA()->setTextureMode(GLW::TMPerWedge);
}
}
void MainWindow::openRecentFile()