From abe28bdaeb490307a0f8edbdb78890e377629d95 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Fri, 4 Dec 2009 10:53:05 +0000 Subject: [PATCH] Updated pro and filters to comply to the new common library system --- src/meshlabplugins/edit_select/edit_select.h | 7 +- .../edit_select/edit_select_factory.h | 4 +- .../filter_colorize/filter_colorize.pro | 2 +- .../filter_colorize/meshcolorize.h | 3 +- .../filter_meshing/filter_meshing.pro | 11 +-- .../filter_meshing/meshfilter.cpp | 1 - .../filter_meshing/meshfilter.h | 60 +------------- .../filter_splitter/filter_splitter.cpp | 5 +- .../filter_splitter/filter_splitter.h | 3 +- .../filter_splitter/filter_splitter.pro | 5 +- .../filter_texture/filter_texture.cpp | 7 -- .../filter_texture/filter_texture.h | 7 +- .../filter_texture/filter_texture.pro | 2 +- src/meshlabplugins/filter_texture/rastering.h | 4 +- src/meshlabplugins/io_base/baseio.h | 3 +- src/meshlabplugins/io_base/io_base.pro | 2 +- src/meshlabplugins/render_gdp/meshrender.h | 82 +------------------ src/meshlabplugins/render_gdp/render_gdp.pro | 13 ++- src/meshlabplugins/render_gdp/shaderDialog.h | 2 +- .../sampledecoration/sampledecorate.h | 3 +- .../sampledecoration/sampledecoration.pro | 6 +- 21 files changed, 37 insertions(+), 195 deletions(-) diff --git a/src/meshlabplugins/edit_select/edit_select.h b/src/meshlabplugins/edit_select/edit_select.h index 0890852bb..f6bcba6a6 100644 --- a/src/meshlabplugins/edit_select/edit_select.h +++ b/src/meshlabplugins/edit_select/edit_select.h @@ -23,12 +23,7 @@ #ifndef EDITPLUGIN_H #define EDITPLUGIN_H -#include -#include -#include - -#include -#include +#include class ExtraMeshEditPlugin : public QObject, public MeshEditInterface { diff --git a/src/meshlabplugins/edit_select/edit_select_factory.h b/src/meshlabplugins/edit_select/edit_select_factory.h index 2f0873c11..85fbae21d 100644 --- a/src/meshlabplugins/edit_select/edit_select_factory.h +++ b/src/meshlabplugins/edit_select/edit_select_factory.h @@ -25,9 +25,7 @@ #ifndef EditSelectFactoryPLUGIN_H #define EditSelectFactoryPLUGIN_H -#include -#include -#include +#include class EditSelectFactory : public QObject, public MeshEditInterfaceFactory { diff --git a/src/meshlabplugins/filter_colorize/filter_colorize.pro b/src/meshlabplugins/filter_colorize/filter_colorize.pro index cffd988e8..7ea532e1d 100644 --- a/src/meshlabplugins/filter_colorize/filter_colorize.pro +++ b/src/meshlabplugins/filter_colorize/filter_colorize.pro @@ -1,4 +1,4 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) HEADERS += meshcolorize.h SOURCES += meshcolorize.cpp diff --git a/src/meshlabplugins/filter_colorize/meshcolorize.h b/src/meshlabplugins/filter_colorize/meshcolorize.h index 8a78b911a..a2b4f4589 100644 --- a/src/meshlabplugins/filter_colorize/meshcolorize.h +++ b/src/meshlabplugins/filter_colorize/meshcolorize.h @@ -81,8 +81,7 @@ removed color_curvature.h in favour of curvature.h #include #include -#include -#include +#include #include #include diff --git a/src/meshlabplugins/filter_meshing/filter_meshing.pro b/src/meshlabplugins/filter_meshing/filter_meshing.pro index 0a19cd949..ddd4a1eca 100644 --- a/src/meshlabplugins/filter_meshing/filter_meshing.pro +++ b/src/meshlabplugins/filter_meshing/filter_meshing.pro @@ -1,9 +1,7 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) HEADERS += transformDialog.h \ - $$VCGDIR/vcg/complex/trimesh/clean.h \ - ../../meshlab/interfaces.h \ - ../../meshlab/meshmodel.h \ + $$VCGDIR/vcg/complex/trimesh/clean.h\ quadric_simp.h \ quadric_tex_simp.h \ meshfilter.h @@ -11,10 +9,7 @@ HEADERS += transformDialog.h \ SOURCES += transformDialog.cpp \ meshfilter.cpp \ quadric_simp.cpp \ - quadric_tex_simp.cpp \ - ../../meshlab/GLLogStream.cpp\ - ../../meshlab/meshmodel.cpp \ - $$GLEWCODE + quadric_tex_simp.cpp TARGET = filter_meshing # all dialog are stored in meshlab/ui directory diff --git a/src/meshlabplugins/filter_meshing/meshfilter.cpp b/src/meshlabplugins/filter_meshing/meshfilter.cpp index 30ceb8f6a..177131b66 100644 --- a/src/meshlabplugins/filter_meshing/meshfilter.cpp +++ b/src/meshlabplugins/filter_meshing/meshfilter.cpp @@ -41,7 +41,6 @@ #include #include "quadric_tex_simp.h" #include "quadric_simp.h" -#include "../../meshlab/GLLogStream.h" using namespace std; using namespace vcg; diff --git a/src/meshlabplugins/filter_meshing/meshfilter.h b/src/meshlabplugins/filter_meshing/meshfilter.h index 97a42fbac..c824e570a 100644 --- a/src/meshlabplugins/filter_meshing/meshfilter.h +++ b/src/meshlabplugins/filter_meshing/meshfilter.h @@ -19,62 +19,6 @@ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * * for more details. * * * -****************************************************************************/ -/* History -$Log: meshfilter.h,v $ -Revision 1.46 2008/02/12 14:21:39 cignoni -changed the function getParameter into the more meaningful getCustomParameter and added the freeze option - -Revision 1.45 2007/10/02 08:13:45 cignoni -New filter interface. Hopefully more clean and easy to use. - -Revision 1.44 2007/07/24 07:20:18 cignoni -Added Freeze transform and improved transformation dialog - -Revision 1.43 2007/04/16 09:25:29 cignoni -** big change ** -Added Layers managemnt. -Interfaces are changing again... - -Revision 1.42 2007/02/25 21:31:49 cignoni -new parameters for quadric simplification - -Revision 1.41 2007/02/08 23:46:17 pirosu -merged srcpar and par in the GetStdParameters() function - -Revision 1.40 2007/02/08 16:10:15 cignoni -Added more parameters to holefilling and quadric simplification - -Revision 1.39 2007/02/08 13:39:58 pirosu -Added Quadric Simplification(with textures) Filter - -Revision 1.38 2007/01/11 19:52:26 pirosu -fixed bug for QT 4.1.0/dotnet2003 -removed the request of the window title to the plugin. The action description is used instead. - -Revision 1.37 2006/12/27 21:41:58 pirosu -Added improvements for the standard plugin window: -split of the apply button in two buttons:ok and apply -added support for parameters with absolute and percentage values - -Revision 1.36 2006/12/13 17:37:27 pirosu -Added standard plugin window support - -Revision 1.35 2006/11/29 00:59:18 cignoni -Cleaned plugins interface; changed useless help class into a plain string - -Revision 1.34 2006/10/22 21:09:35 cignoni -Added Close Hole - -Revision 1.33 2006/10/19 08:57:45 cignoni -Added working ball pivoting and normal creation - -Revision 1.32 2006/10/10 21:13:08 cignoni -Added remove non manifold and quadric simplification filter. - -Revision 1.31 2006/05/25 09:46:38 cignoni -missing std and and all the other gcc detected syntax errors - ****************************************************************************/ #ifndef EXTRAFILTERSPLUGIN_H @@ -84,10 +28,8 @@ missing std and and all the other gcc detected syntax errors #include #include -#include -#include +#include #include "transformDialog.h" -#include "../../meshlab/GLLogStream.h" class ExtraMeshFilterPlugin : public QObject, public MeshFilterInterface { diff --git a/src/meshlabplugins/filter_splitter/filter_splitter.cpp b/src/meshlabplugins/filter_splitter/filter_splitter.cpp index f854ddafd..412b2d13b 100644 --- a/src/meshlabplugins/filter_splitter/filter_splitter.cpp +++ b/src/meshlabplugins/filter_splitter/filter_splitter.cpp @@ -27,8 +27,7 @@ #include #include -#include -#include +#include "filter_splitter.h" #include #include @@ -39,7 +38,7 @@ #include #include -#include "filter_splitter.h" + using namespace std; using namespace vcg; diff --git a/src/meshlabplugins/filter_splitter/filter_splitter.h b/src/meshlabplugins/filter_splitter/filter_splitter.h index 75d279fbf..3c9a63c1b 100644 --- a/src/meshlabplugins/filter_splitter/filter_splitter.h +++ b/src/meshlabplugins/filter_splitter/filter_splitter.h @@ -26,8 +26,7 @@ #include -#include -#include +#include class FilterSplitterPlugin : public QObject, public MeshFilterInterface { diff --git a/src/meshlabplugins/filter_splitter/filter_splitter.pro b/src/meshlabplugins/filter_splitter/filter_splitter.pro index 8a05199e2..6d621cc90 100644 --- a/src/meshlabplugins/filter_splitter/filter_splitter.pro +++ b/src/meshlabplugins/filter_splitter/filter_splitter.pro @@ -1,9 +1,8 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) HEADERS += filter_splitter.h -SOURCES += filter_splitter.cpp \ - $$GLEWCODE +SOURCES += filter_splitter.cpp TARGET = filter_splitter diff --git a/src/meshlabplugins/filter_texture/filter_texture.cpp b/src/meshlabplugins/filter_texture/filter_texture.cpp index 1e592c735..594ec9af4 100644 --- a/src/meshlabplugins/filter_texture/filter_texture.cpp +++ b/src/meshlabplugins/filter_texture/filter_texture.cpp @@ -25,13 +25,6 @@ #include #include #include -#include -#include - -#include -#include -#include - #include "filter_texture.h" #include "pushpull.h" #include "rastering.h" diff --git a/src/meshlabplugins/filter_texture/filter_texture.h b/src/meshlabplugins/filter_texture/filter_texture.h index f70c5dbb4..d94a1494c 100644 --- a/src/meshlabplugins/filter_texture/filter_texture.h +++ b/src/meshlabplugins/filter_texture/filter_texture.h @@ -25,9 +25,12 @@ #define _FILTER_TEXTURE_H #include +#include -#include -#include +#include +#include +#include +#include class FilterTexturePlugin : public QObject, public MeshFilterInterface { diff --git a/src/meshlabplugins/filter_texture/filter_texture.pro b/src/meshlabplugins/filter_texture/filter_texture.pro index ffb9f7455..eb4c78d5c 100644 --- a/src/meshlabplugins/filter_texture/filter_texture.pro +++ b/src/meshlabplugins/filter_texture/filter_texture.pro @@ -1,4 +1,4 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) HEADERS += filter_texture.h \ pushpull.h \ diff --git a/src/meshlabplugins/filter_texture/rastering.h b/src/meshlabplugins/filter_texture/rastering.h index b1d66ce2b..cd88e61fb 100644 --- a/src/meshlabplugins/filter_texture/rastering.h +++ b/src/meshlabplugins/filter_texture/rastering.h @@ -25,7 +25,7 @@ #define _RASTERING_H #include -#include +#include #include #include @@ -449,4 +449,4 @@ static void TextureCorrectedWEdge(MetroMesh & m, VertexSampler &ps, int textureW } } -#endif \ No newline at end of file +#endif diff --git a/src/meshlabplugins/io_base/baseio.h b/src/meshlabplugins/io_base/baseio.h index a686d47d5..2a31531e0 100644 --- a/src/meshlabplugins/io_base/baseio.h +++ b/src/meshlabplugins/io_base/baseio.h @@ -39,8 +39,7 @@ #include -#include "../../meshlab/meshmodel.h" -#include "../../meshlab/interfaces.h" +#include class BaseMeshIOPlugin : public QObject, public MeshIOInterface { diff --git a/src/meshlabplugins/io_base/io_base.pro b/src/meshlabplugins/io_base/io_base.pro index 6ad8ed703..52580c6fb 100644 --- a/src/meshlabplugins/io_base/io_base.pro +++ b/src/meshlabplugins/io_base/io_base.pro @@ -1,4 +1,4 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) HEADERS += baseio.h \ $$VCGDIR/wrap/io_trimesh/import_obj.h \ diff --git a/src/meshlabplugins/render_gdp/meshrender.h b/src/meshlabplugins/render_gdp/meshrender.h index 906089496..c43819c91 100644 --- a/src/meshlabplugins/render_gdp/meshrender.h +++ b/src/meshlabplugins/render_gdp/meshrender.h @@ -19,93 +19,13 @@ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * * for more details. * * * -****************************************************************************/ -/**************************************************************************** -History -$Log$ -Revision 1.22 2008/04/04 14:16:02 cignoni -Solved namespace ambiguities caused by the removal of a silly 'using namespace' in meshmodel.h - -Revision 1.21 2007/10/09 13:02:08 fuscof -Initial implementation of multipass rendering. -Please note that MeshRenderInterface has been modified to get the number of rendering passes. - -Revision 1.20 2006/07/08 06:37:48 cignoni -Many small bugs correction (esc crash, info in about, obj loading progress,fullscreen es) - -Revision 1.19 2006/06/08 08:54:43 zifnab1974 -Do not use classname in class definition - -Revision 1.18 2006/05/25 04:57:45 cignoni -Major 0.7 release. A lot of things changed. Colorize interface gone away, Editing and selection start to work. -Optional data really working. Clustering decimation totally rewrote. History start to work. Filters organized in classes. - -Revision 1.17 2006/02/27 05:02:01 ggangemi -Added texture support - -Revision 1.16 2006/02/21 17:26:38 ggangemi -RenderMode is now passed to MeshRender::Init() - -Revision 1.14 2006/02/19 02:57:49 ggangemi -Now each shader can change the opengl status - -Revision 1.13 2006/02/03 12:27:08 ggangemi -improved shaderDialog support - -Revision 1.12 2006/01/25 16:58:05 ggangemi -shaderdialog closed every time the user changes the current shader - -Revision 1.11 2006/01/25 02:59:38 ggangemi -added shadersDialog initial support - -Revision 1.10 2006/01/19 11:41:42 ggangemi -Reduced memory occupation of "UniformVariable" struct - -Revision 1.9 2006/01/17 11:04:14 cignoni -Removed bug due to multiple creation of list of action - -Revision 1.8 2005/12/29 13:52:31 mariolatronico -gl/glew.h -> GL/glew.h - -Revision 1.7 2005/12/24 04:18:46 ggangemi -Added generic .gdp shaders support - -Revision 1.6 2005/12/19 16:22:30 davide_portelli -Now "Toon Shader" plugin is checkable - -Revision 1.5 2005/12/05 18:11:28 ggangemi -Added toon shader example - -Revision 1.4 2005/12/05 16:52:57 ggangemi -new interfaces - -Revision 1.3 2005/12/03 22:50:06 cignoni -Added copyright info - ****************************************************************************/ #ifndef SHADERRENDERPLUGIN_H #define SHADERRENDERPLUGIN_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include -#include -#include +#include #include "textfile.h" #include "shaderStructs.h" #include "shaderDialog.h" diff --git a/src/meshlabplugins/render_gdp/render_gdp.pro b/src/meshlabplugins/render_gdp/render_gdp.pro index 37b5f822a..468bbe58c 100644 --- a/src/meshlabplugins/render_gdp/render_gdp.pro +++ b/src/meshlabplugins/render_gdp/render_gdp.pro @@ -1,11 +1,16 @@ include (../../shared.pri) -HEADERS = meshrender.h textfile.h shaderStructs.h shaderDialog.h ../../meshlab/meshmodel.h +HEADERS = meshrender.h \ + textfile.h \ + shaderStructs.h \ + shaderDialog.h \ + ../../common/meshmodel.h + SOURCES = meshrender.cpp \ textfile.cpp \ - shaderDialog.cpp \ - $$GLEWCODE \ - ../../meshlab/meshmodel.cpp + shaderDialog.cpp #\ +# $$GLEWCODE \ +# ../../common/meshmodel.cpp TARGET = render_gdp diff --git a/src/meshlabplugins/render_gdp/shaderDialog.h b/src/meshlabplugins/render_gdp/shaderDialog.h index 0f0d87a81..f8a63d6ba 100644 --- a/src/meshlabplugins/render_gdp/shaderDialog.h +++ b/src/meshlabplugins/render_gdp/shaderDialog.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include "shaderStructs.h" diff --git a/src/sampleplugins/sampledecoration/sampledecorate.h b/src/sampleplugins/sampledecoration/sampledecorate.h index 27cb322bd..28b6bac1a 100644 --- a/src/sampleplugins/sampledecoration/sampledecorate.h +++ b/src/sampleplugins/sampledecoration/sampledecorate.h @@ -34,8 +34,7 @@ New small samples #include #include -#include -#include +#include #include "cubemap.h" //#include "../../meshlab/mainwindow.h" diff --git a/src/sampleplugins/sampledecoration/sampledecoration.pro b/src/sampleplugins/sampledecoration/sampledecoration.pro index 1b3b6a60a..bc2198633 100644 --- a/src/sampleplugins/sampledecoration/sampledecoration.pro +++ b/src/sampleplugins/sampledecoration/sampledecoration.pro @@ -1,13 +1,11 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) QT += opengl HEADERS += sampledecorate.h cubemap.h SOURCES += sampledecorate.cpp\ - cubemap.cpp \ - ../../common/pluginmanager.cpp \ - $$GLEWCODE + cubemap.cpp TARGET = sampledecoration