On Feb 9, 2008 7:08 PM, Ian Jackson <[EMAIL PROTECTED]> wrote: > Teemu Ikonen writes ("Re: Bug#426581: meshlab - anyone still working on > this"): > > http://esko.osmas.info/~tmx/meshlab/ > I've reviewed this and it's looking reasonably good.
Hi Ian, Paolo and others, Thanks for the review. I fixed the problems you found except these: > After I built it (on lenny), I ran meshlab from an xterm. It opened > an entirely blank override-redirect pale grey window covering the top > left area of my display, as well as the main window. What is that > blank window for ? Can it be got rid of ? I cannot repeat this. > I tested it on a .off from the [EMAIL PROTECTED] library and it seemed to more > or less work. However there were a couple of things which made it > segfault. For example, if I select any shader other than none, or if > I ask for `Edit / Vertex painting' and then click on the object. I > assume that these are installation problems of some kind (ie, bugs in > the packaging). Edit / Vertex painting works here. The shaders crash here as well, but AFAIK they need hardware support to work, which I do not have here. Meshlab should check if GL_ARB_vertex_shader and GL_ARB_fragment_shader extensions are available, before trying to use them. I don't have time to start fixing this, or other upstream bugs. Paolo, can you help here? > If I run the program with --help or -h, it tries to open them as > files. It ought at least to bomb out with a message saying please > refer to the meshlab wiki (with a URL). Upstream. > Eyeballing the patch I notice an awful lot of > -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include > +INCLUDEPATH += ../.. ../../../../sf > Maybe it would be possible to suggest to prepare a patch for upstream > submission which replaces ../../../../code/lib/glew/include with > $(GLEWINCLUDEPATH) or some such, which would be set in one place. > Likewise various places where glew.c is referred to. I cleaned up my build / directory / etc. hacks a bit, and attached separate patches to this mail for Paolos convenience, if he chooses to implement them in his sources. Although I'm sure he'll find better solutions himself :) I updated the package and put it to again to http://esko.osmas.info/~tmx/meshlab/ but as there are still problems (mainly with the shaders), maybe the package is not quite ready yet. Teemu
=== modified file 'meshlab/src/meshlab/interfaces.h' --- meshlab/src/meshlab/interfaces.h 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlab/interfaces.h 2008-02-11 15:14:21 +0000 @@ -223,12 +223,16 @@ static QString getPluginDirPath() { + #if defined(DEBIAN) + QDir pluginsDir(QString("/usr/lib/meshlab")); + #else QDir pluginsDir(getBaseDirPath()); if(!pluginsDir.exists("plugins")) QMessageBox::warning(0,"Meshlab Initialization","Serious error. Unable to find the plugins directory."); pluginsDir.cd("plugins"); - return pluginsDir.absolutePath(); + #endif + return pluginsDir.absolutePath(); } }; === modified file 'meshlab/src/meshlab/meshlab.pro' --- meshlab/src/meshlab/meshlab.pro 2008-02-11 11:51:26 +0000 +++ meshlab/src/meshlab/meshlab.pro 2008-02-11 15:14:21 +0000 @@ -71,6 +71,7 @@ DEFINES += GLEW_STATIC LIBS += -lGLEW +DEFINES += DEBIAN INCLUDEPATH += . ../../../sf ../../../code/lib/glew/include CONFIG += stl === modified file 'meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp' --- meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp 2008-02-11 15:14:21 +0000 @@ -711,8 +711,10 @@ void AmbientOcclusionPlugin::set_shaders(char *shaderName, GLuint &v, GLuint &f, GLuint &pr) { - QDir shadersDir = QDir(qApp->applicationDirPath()); - +#if defined(DEBIAN) + QDir shadersDir = QDir(QString("/usr/share/meshlab/shaders")); +#else + QDir shadersDir = QDir(qApp->applicationDirPath()); #if defined(Q_OS_WIN) if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins" ) @@ -734,7 +736,8 @@ QMessageBox::information(0, "Ambient Occlusion Plugin","Unable to find the shaders directory.\nNo shaders will be loaded."); return; } - +#endif // DEBIAN + f = glCreateShader(GL_FRAGMENT_SHADER); v = glCreateShader(GL_VERTEX_SHADER); === modified file 'meshlab/src/meshlabplugins/filter_ao/filter_ao.pro' --- meshlab/src/meshlabplugins/filter_ao/filter_ao.pro 2008-02-11 11:51:26 +0000 +++ meshlab/src/meshlabplugins/filter_ao/filter_ao.pro 2008-02-11 15:14:21 +0000 @@ -13,6 +13,7 @@ . DEFINES += GLEW_STATIC LIBS += -lGLEW +DEFINES += DEBIAN win32{ DEFINES += NOMINMAX === modified file 'meshlab/src/meshlabplugins/meshrender/meshrender.cpp' --- meshlab/src/meshlabplugins/meshrender/meshrender.cpp 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/meshrender/meshrender.cpp 2008-02-11 15:14:21 +0000 @@ -106,6 +106,9 @@ qaNone->setCheckable(false); actionList << qaNone; +#if defined(DEBIAN) + QDir shadersDir = QDir(QString("/usr/share/meshlab/shaders")); +#else QDir shadersDir = QDir(qApp->applicationDirPath()); #if defined(Q_OS_WIN) if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins" ) @@ -123,7 +126,7 @@ QMessageBox::information(0, "MeshLAb", "Unable to find the shaders directory.\n" "No shaders will be loaded."); - +#endif // DEBIAN QDomDocument doc; foreach (QString fileName, shadersDir.entryList(QDir::Files)) { === modified file 'meshlab/src/meshlabplugins/meshrender/meshrender.pro' --- meshlab/src/meshlabplugins/meshrender/meshrender.pro 2008-02-11 11:51:26 +0000 +++ meshlab/src/meshlabplugins/meshrender/meshrender.pro 2008-02-11 15:14:21 +0000 @@ -14,6 +14,7 @@ FORMS = shaderDialog.ui DEFINES += GLEW_STATIC LIBS += -lGLEW +DEFINES += DEBIAN CONFIG += debug_and_release # mac:CONFIG += x86 ppc === modified file 'meshlab/src/meshlabplugins/render_rm/render_rm.pro' --- meshlab/src/meshlabplugins/render_rm/render_rm.pro 2008-02-11 11:51:26 +0000 +++ meshlab/src/meshlabplugins/render_rm/render_rm.pro 2008-02-11 15:14:21 +0000 @@ -30,6 +30,7 @@ FORMS = rmShadowDialog.ui DEFINES += GLEW_STATIC LIBS += -lGLEW +DEFINES += DEBIAN CONFIG += debug_and_release mac:CONFIG += x86 ppc === modified file 'meshlab/src/meshlabplugins/render_rm/rmmeshrender.cpp' --- meshlab/src/meshlabplugins/render_rm/rmmeshrender.cpp 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/render_rm/rmmeshrender.cpp 2008-02-11 15:14:21 +0000 @@ -58,8 +58,11 @@ void RmMeshShaderRenderPlugin::initActionList() { - QDir shadersDir = QDir(qApp->applicationDirPath()); -#if defined(Q_OS_WIN) +#if defined(DEBIAN) + QDir shadersDir = QDir(QString("/usr/share/meshlab/shadersrm")); +#else + QDir shadersDir = QDir(qApp->applicationDirPath()); +# if defined(Q_OS_WIN) if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins" ) shadersDir.cdUp(); #elif defined(Q_OS_MAC) @@ -77,7 +80,7 @@ "Unable to find the render monkey shaders directory.\n" "No shaders will be loaded."); return; } - +#endif // DEBIAN int errors = 0; int successes = 0;
=== modified file 'meshlab/src/meshlabplugins/editalign/editalign.pro' --- meshlab/src/meshlabplugins/editalign/editalign.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/meshlabplugins/editalign/editalign.pro 2008-02-11 13:36:26 +0000 @@ -27,7 +27,7 @@ ../../../../sf/wrap/ply/plylib.cpp\ ../../../../sf/wrap/gui/trackball.cpp\ ../../../../sf/wrap/gui/trackmode.cpp \ - ../../../../code/lib/glew/src/glew.c + $$GLEW_C FORMS += alignDialog.ui TARGET = editalign === modified file 'meshlab/src/meshlabplugins/editmeasure/editmeasure.pro' --- meshlab/src/meshlabplugins/editmeasure/editmeasure.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/meshlabplugins/editmeasure/editmeasure.pro 2008-02-11 13:36:26 +0000 @@ -2,7 +2,7 @@ CONFIG += plugin INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = editmeasure.h -SOURCES = editmeasure.cpp ../../../../code/lib/glew/src/glew.c +SOURCES = editmeasure.cpp $$GLEW_C TARGET = editmeasure DESTDIR = ../../meshlab/plugins DEFINES += GLEW_STATIC === modified file 'meshlab/src/meshlabplugins/editpaint/editpaint.pro' --- meshlab/src/meshlabplugins/editpaint/editpaint.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/meshlabplugins/editpaint/editpaint.pro 2008-02-11 13:36:26 +0000 @@ -5,7 +5,7 @@ HEADERS = editpaint.h \ colorwid.h \ ui_painttoolbox.h -SOURCES = editpaint.cpp ../../../../code/lib/glew/src/glew.c \ +SOURCES = editpaint.cpp $$GLEW_C \ paintbox.cpp TARGET = editpaint DESTDIR = ../../meshlab/plugins === modified file 'meshlab/src/meshlabplugins/editsegment/editsegment.pro' --- meshlab/src/meshlabplugins/editsegment/editsegment.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/meshlabplugins/editsegment/editsegment.pro 2008-02-11 13:36:26 +0000 @@ -3,7 +3,7 @@ CONFIG += debug_and_release INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = editsegment.h cutting.h curvaturetensor.h meshcutdialog.h colorpicker.h -SOURCES = editsegment.cpp ../../../../code/lib/glew/src/glew.c meshcutdialog.cpp colorpiker.cpp +SOURCES = editsegment.cpp $$GLEW_C meshcutdialog.cpp colorpiker.cpp TARGET = editsegment DESTDIR = ../../meshlab/plugins DEFINES += GLEW_STATIC === modified file 'meshlab/src/meshlabplugins/editslice/editslice.pro' --- meshlab/src/meshlabplugins/editslice/editslice.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/meshlabplugins/editslice/editslice.pro 2008-02-11 13:36:26 +0000 @@ -7,7 +7,7 @@ SOURCES = editslice.cpp \ slicedialog.cpp\ - ../../../../code/lib/glew/src/glew.c \ + $$GLEW_C \ ../../../../sf/wrap/gui/trackball.cpp\ ../../../../sf/wrap/gui/trackmode.cpp \ svgpro.cpp === modified file 'meshlab/src/meshlabplugins/filter_ao/filter_ao.pro' --- meshlab/src/meshlabplugins/filter_ao/filter_ao.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/meshlabplugins/filter_ao/filter_ao.pro 2008-02-11 13:36:26 +0000 @@ -22,5 +22,5 @@ HEADERS += ./filter_ao.h AOGLWidget.h SOURCES += ./filter_ao.cpp AOGLWidget.cpp \ ../../meshlab/filterparameter.cpp \ - ../../../../code/lib/glew/src/glew.c + $$GLEW_C === modified file 'meshlab/src/meshlabplugins/meshedit/meshedit.pro' --- meshlab/src/meshlabplugins/meshedit/meshedit.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/meshlabplugins/meshedit/meshedit.pro 2008-02-11 13:36:26 +0000 @@ -2,7 +2,7 @@ CONFIG += plugin INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = meshedit.h -SOURCES = meshedit.cpp ../../../../code/lib/glew/src/glew.c +SOURCES = meshedit.cpp $$GLEW_C TARGET = meshedit DESTDIR = ../../meshlab/plugins DEFINES += GLEW_STATIC === modified file 'meshlab/src/meshlabplugins/meshrender/meshrender.pro' --- meshlab/src/meshlabplugins/meshrender/meshrender.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/meshlabplugins/meshrender/meshrender.pro 2008-02-11 13:36:26 +0000 @@ -3,7 +3,7 @@ INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH #LIBPATH += ../../../../code/lib/glew/lib/ HEADERS = meshrender.h textfile.h shaderStructs.h shaderDialog.h -SOURCES = meshrender.cpp textfile.cpp shaderDialog.cpp ../../../../code/lib/glew/src/glew.c +SOURCES = meshrender.cpp textfile.cpp shaderDialog.cpp $$GLEW_C TARGET = meshrender DESTDIR = ../../meshlab/plugins === modified file 'meshlab/src/meshlabplugins/render_rm/render_rm.pro' --- meshlab/src/meshlabplugins/render_rm/render_rm.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/meshlabplugins/render_rm/render_rm.pro 2008-02-11 13:36:26 +0000 @@ -18,7 +18,7 @@ parser/RmPass.cpp \ parser/RmXmlParser.cpp \ parser/UniformVar.cpp \ - ../../../../code/lib/glew/src/glew.c + $$GLEW_C TARGET = render_rm === modified file 'meshlab/src/sampleplugins/sampledecoration/sampledecoration.pro' --- meshlab/src/sampleplugins/sampledecoration/sampledecoration.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/sampleplugins/sampledecoration/sampledecoration.pro 2008-02-11 13:36:26 +0000 @@ -8,7 +8,7 @@ SOURCES = sampledecorate.cpp\ cubemap.cpp \ ../../meshlab/filterparameter.cpp \ - ../../../../code/lib/glew/src/glew.c + $$GLEW_C TARGET = sampledecoration DESTDIR = ../../meshlab/plugins === modified file 'meshlab/src/sampleplugins/sampleedit/sampleedit.pro' --- meshlab/src/sampleplugins/sampleedit/sampleedit.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/sampleplugins/sampleedit/sampleedit.pro 2008-02-11 13:36:26 +0000 @@ -2,7 +2,7 @@ CONFIG += plugin INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = sampleedit.h -SOURCES = sampleedit.cpp ../../../../code/lib/glew/src/glew.c +SOURCES = sampleedit.cpp $$GLEW_C TARGET = sampleedit DESTDIR = ../../meshlab/plugins DEFINES += GLEW_STATIC === modified file 'meshlab/src/sampleplugins/samplefilterdoc/samplefilterdoc.pro' --- meshlab/src/sampleplugins/samplefilterdoc/samplefilterdoc.pro 2008-02-11 13:36:00 +0000 +++ meshlab/src/sampleplugins/samplefilterdoc/samplefilterdoc.pro 2008-02-11 13:36:26 +0000 @@ -6,7 +6,7 @@ SOURCES = samplefilterdoc.cpp \ ../../meshlab/filterparameter.cpp \ - ../../../../code/lib/glew/src/glew.c + $$GLEW_C TARGET = samplefilterdoc
=== modified file 'meshlab/src/fgt/edit_quality/edit_quality.pro' --- meshlab/src/fgt/edit_quality/edit_quality.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/fgt/edit_quality/edit_quality.pro 2008-02-11 13:36:00 +0000 @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin CONFIG += stl -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = const_types.h histogram.h qualitymapper.h qualitymapperdialog.h transferfunction.h util.h handle.h eqhandle.h SOURCES = qualitymapper.cpp transferfunction.cpp qualitymapperdialog.cpp util.cpp handle.cpp eqhandle.cpp\ ../../meshlab/filterparameter.cpp === modified file 'meshlab/src/meshlabplugins/baseio/baseio.pro' --- meshlab/src/meshlabplugins/baseio/baseio.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/baseio/baseio.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = baseio.h \ ../../../../sf/wrap/ply/plylib.h \ ../../../../sf/wrap/io_trimesh/io_material.h \ === modified file 'meshlab/src/meshlabplugins/cleanfilter/cleanfilter.pro' --- meshlab/src/meshlabplugins/cleanfilter/cleanfilter.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/cleanfilter/cleanfilter.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = cleanfilter.h === modified file 'meshlab/src/meshlabplugins/colladaio/colladaio.pro' --- meshlab/src/meshlabplugins/colladaio/colladaio.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/colladaio/colladaio.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = colladaio.h SOURCES = colladaio.cpp TARGET = colladaio === modified file 'meshlab/src/meshlabplugins/editalign/editalign.pro' --- meshlab/src/meshlabplugins/editalign/editalign.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/editalign/editalign.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = editalign.h \ meshtree.h \ alignDialog.h \ === modified file 'meshlab/src/meshlabplugins/editmeasure/editmeasure.pro' --- meshlab/src/meshlabplugins/editmeasure/editmeasure.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/editmeasure/editmeasure.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = editmeasure.h SOURCES = editmeasure.cpp ../../../../code/lib/glew/src/glew.c TARGET = editmeasure === modified file 'meshlab/src/meshlabplugins/editpaint/editpaint.pro' --- meshlab/src/meshlabplugins/editpaint/editpaint.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/editpaint/editpaint.pro 2008-02-11 13:36:00 +0000 @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = editpaint.h \ colorwid.h \ ui_painttoolbox.h === modified file 'meshlab/src/meshlabplugins/editrgbtri/editrgbtri.pro' --- meshlab/src/meshlabplugins/editrgbtri/editrgbtri.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/editrgbtri/editrgbtri.pro 2008-02-11 13:36:00 +0000 @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../../ ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../../ ../../../../sf $$GLEWINCLUDEPATH HEADERS = rgbt.h \ widgetRgbT.h \ utilities.h \ === modified file 'meshlab/src/meshlabplugins/editsegment/editsegment.pro' --- meshlab/src/meshlabplugins/editsegment/editsegment.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/editsegment/editsegment.pro 2008-02-11 13:36:00 +0000 @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin CONFIG += debug_and_release -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = editsegment.h cutting.h curvaturetensor.h meshcutdialog.h colorpicker.h SOURCES = editsegment.cpp ../../../../code/lib/glew/src/glew.c meshcutdialog.cpp colorpiker.cpp TARGET = editsegment === modified file 'meshlab/src/meshlabplugins/editslice/editslice.pro' --- meshlab/src/meshlabplugins/editslice/editslice.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/editslice/editslice.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = editslice.h \ slicedialog.h\ svgpro.h === modified file 'meshlab/src/meshlabplugins/epoch_io/epoch_io.pro' --- meshlab/src/meshlabplugins/epoch_io/epoch_io.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/epoch_io/epoch_io.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include ../../../../code/lib/bzip2-1.0.3 +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH ../../../../code/lib/bzip2-1.0.3 FORMS = ui/v3dImportDialog.ui HEADERS = epoch_io.h \ === modified file 'meshlab/src/meshlabplugins/filter_ao/filter_ao.pro' --- meshlab/src/meshlabplugins/filter_ao/filter_ao.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/filter_ao/filter_ao.pro 2008-02-11 13:36:00 +0000 @@ -9,7 +9,7 @@ INCLUDEPATH += ./../.. \ ./../../../../sf \ - ./../../../../code/lib/glew/include \ + ./$$GLEWINCLUDEPATH \ . DEFINES += GLEW_STATIC === modified file 'meshlab/src/meshlabplugins/filter_poisson/filter_poisson.pro' --- meshlab/src/meshlabplugins/filter_poisson/filter_poisson.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/filter_poisson/filter_poisson.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin stl -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = filter_poisson.h QMAKE_CXXFLAGS += -fpermissive === modified file 'meshlab/src/meshlabplugins/meshcolorize/meshcolorize.pro' --- meshlab/src/meshlabplugins/meshcolorize/meshcolorize.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/meshcolorize/meshcolorize.pro 2008-02-11 13:36:00 +0000 @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin CONFIG += stl -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = meshcolorize.h curvature.h equalizerDialog.h smoothcolor.h SOURCES = meshcolorize.cpp \ equalizerDialog.cpp\ === modified file 'meshlab/src/meshlabplugins/meshdecorate/meshdecorate.pro' --- meshlab/src/meshlabplugins/meshdecorate/meshdecorate.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/meshdecorate/meshdecorate.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include ../../../../code/lib/glut +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH ../../../../code/lib/glut HEADERS = meshdecorate.h SOURCES = meshdecorate.cpp TARGET = meshdecorate === modified file 'meshlab/src/meshlabplugins/meshedit/meshedit.pro' --- meshlab/src/meshlabplugins/meshedit/meshedit.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/meshedit/meshedit.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = meshedit.h SOURCES = meshedit.cpp ../../../../code/lib/glew/src/glew.c TARGET = meshedit === modified file 'meshlab/src/meshlabplugins/meshfilter/meshfilter.pro' --- meshlab/src/meshlabplugins/meshfilter/meshfilter.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/meshfilter/meshfilter.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = transformDialog.h \ ../../../../sf/vcg/complex/trimesh/clean.h \ ../../meshlab/GenericELDialog.h \ === modified file 'meshlab/src/meshlabplugins/meshio/meshio.pro' --- meshlab/src/meshlabplugins/meshio/meshio.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/meshio/meshio.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = meshio.h \ ../../../../sf/wrap/ply/plylib.h \ ../../../../sf/wrap/io_trimesh/export_obj.h \ === modified file 'meshlab/src/meshlabplugins/meshrender/meshrender.pro' --- meshlab/src/meshlabplugins/meshrender/meshrender.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/meshrender/meshrender.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH #LIBPATH += ../../../../code/lib/glew/lib/ HEADERS = meshrender.h textfile.h shaderStructs.h shaderDialog.h SOURCES = meshrender.cpp textfile.cpp shaderDialog.cpp ../../../../code/lib/glew/src/glew.c === modified file 'meshlab/src/meshlabplugins/meshselect/meshselect.pro' --- meshlab/src/meshlabplugins/meshselect/meshselect.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/meshselect/meshselect.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = meshselect.h SOURCES = meshselect.cpp\ ../../meshlab/filterparameter.cpp === modified file 'meshlab/src/meshlabplugins/render_rm/render_rm.pro' --- meshlab/src/meshlabplugins/render_rm/render_rm.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/render_rm/render_rm.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH #LIBPATH += ../../../../code/lib/glew/lib/ HEADERS += rmmeshrender.h \ === modified file 'meshlab/src/meshlabplugins/sampleplugins/samplefilter.pro' --- meshlab/src/meshlabplugins/sampleplugins/samplefilter.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/sampleplugins/samplefilter.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = samplefilter.h SOURCES = samplefilter.cpp === modified file 'meshlab/src/meshlabplugins/sampleplugins/sampleio.pro' --- meshlab/src/meshlabplugins/sampleplugins/sampleio.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/sampleplugins/sampleio.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = sampleio.h \ SOURCES = sampleio.cpp === modified file 'meshlab/src/meshlabplugins/u3d_io/u3d_io.pro' --- meshlab/src/meshlabplugins/u3d_io/u3d_io.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/u3d_io/u3d_io.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH FORMS = ui/u3d_gui.ui HEADERS = u3d_io.h \ === modified file 'meshlab/src/sampleplugins/filterborder/filterborder.pro' --- meshlab/src/sampleplugins/filterborder/filterborder.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/sampleplugins/filterborder/filterborder.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = filterborder.h === modified file 'meshlab/src/sampleplugins/filtercreateiso/filtercreateiso.pro' --- meshlab/src/sampleplugins/filtercreateiso/filtercreateiso.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/sampleplugins/filtercreateiso/filtercreateiso.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = filtercreateiso.h SOURCES = filtercreateiso.cpp\ === modified file 'meshlab/src/sampleplugins/filtergeodesic/filtergeodesic.pro' --- meshlab/src/sampleplugins/filtergeodesic/filtergeodesic.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/sampleplugins/filtergeodesic/filtergeodesic.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = filtergeodesic.h SOURCES = filtergeodesic.cpp\ === modified file 'meshlab/src/sampleplugins/sampledecoration/sampledecoration.pro' --- meshlab/src/sampleplugins/sampledecoration/sampledecoration.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/sampleplugins/sampledecoration/sampledecoration.pro 2008-02-11 13:36:00 +0000 @@ -1,7 +1,7 @@ TEMPLATE = lib QT += opengl CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = sampledecorate.h cubemap.h === modified file 'meshlab/src/sampleplugins/sampleedit/sampleedit.pro' --- meshlab/src/sampleplugins/sampleedit/sampleedit.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/sampleplugins/sampleedit/sampleedit.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = sampleedit.h SOURCES = sampleedit.cpp ../../../../code/lib/glew/src/glew.c TARGET = sampleedit === modified file 'meshlab/src/sampleplugins/samplefilter/samplefilter.pro' --- meshlab/src/sampleplugins/samplefilter/samplefilter.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/sampleplugins/samplefilter/samplefilter.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = samplefilter.h SOURCES = samplefilter.cpp \ === modified file 'meshlab/src/sampleplugins/samplefilterdoc/samplefilterdoc.pro' --- meshlab/src/sampleplugins/samplefilterdoc/samplefilterdoc.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/sampleplugins/samplefilterdoc/samplefilterdoc.pro 2008-02-11 13:36:00 +0000 @@ -1,7 +1,7 @@ TEMPLATE = lib QT += opengl CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = samplefilterdoc.h SOURCES = samplefilterdoc.cpp \ === modified file 'meshlab/src/sampleplugins/sampleio/sampleio.pro' --- meshlab/src/sampleplugins/sampleio/sampleio.pro 2008-01-30 15:46:19 +0000 +++ meshlab/src/sampleplugins/sampleio/sampleio.pro 2008-02-11 13:36:00 +0000 @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += plugin -INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include +INCLUDEPATH += ../.. ../../../../sf $$GLEWINCLUDEPATH HEADERS = sampleio.h \ SOURCES = sampleio.cpp
=== modified file 'meshlab/src/meshlabplugins/render_rm/glstateholder.h' --- meshlab/src/meshlabplugins/render_rm/glstateholder.h 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlabplugins/render_rm/glstateholder.h 2008-01-31 15:09:44 +0000 @@ -160,7 +160,7 @@ class GLStateHolder : public QObject { Q_OBJECT - + friend class RmMeshShaderRenderPlugin; // private data members private:
=== modified file 'meshlab/src/meshlab/mainwindow.h' --- meshlab/src/meshlab/mainwindow.h 2008-01-30 15:46:19 +0000 +++ meshlab/src/meshlab/mainwindow.h 2008-02-12 11:13:24 +0000 @@ -193,7 +193,7 @@ MainWindow(); static bool QCallBack(const int pos, const char * str); const QString appName() const {return tr("MeshLab v")+appVer(); } - const QString appVer() const {return tr("1.1.0b"); } + const QString appVer() const {return tr("1.1.0"); } public slots: