Updated pros and sources to comply to the new common library system

2026-03-15 09:04:36 +00:00 · 2009-12-05 00:49:24 +00:00 · 2009-12-05 00:49:24 +00:00 · 0d080202ae
commit 0d080202ae
parent 6770877355
30 changed files with 36 additions and 104 deletions
--- a/src/meshlabplugins/filter_sampling/filter_sampling.cpp
+++ b/src/meshlabplugins/filter_sampling/filter_sampling.cpp
@ -32,23 +32,15 @@ $Log: samplefilter.cpp,v $
 #include <time.h>
 #include <limits>

-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include "filter_sampling.h"

 #include <vcg/complex/trimesh/clean.h>
-#include <vcg/complex/trimesh/update/position.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/quality.h>
 #include <vcg/complex/trimesh/point_sampling.h>
 #include <vcg/complex/trimesh/create/resampler.h>
 #include <vcg/complex/trimesh/clustering.h>
 #include <vcg/simplex/face/distance.h>
-#include <vcg/complex/trimesh/update/color.h>
 #include <vcg/complex/trimesh/geodesic.h>
 #include <vcg/space/index/grid_static_ptr.h>
-#include "filter_sampling.h"
 #include "voronoi_clustering.h"

 using namespace vcg;
--- a/src/meshlabplugins/filter_sampling/filter_sampling.h
+++ b/src/meshlabplugins/filter_sampling/filter_sampling.h
@ -35,9 +35,7 @@ add sampleplugins
 #define FILTERDOCSAMPLINGPLUGIN_H

 #include <QObject>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>

 class FilterDocSampling : public QObject, public MeshFilterInterface
 {
--- a/src/meshlabplugins/filter_sampling/filter_sampling.pro
+++ b/src/meshlabplugins/filter_sampling/filter_sampling.pro
@ -1,13 +1,9 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)

 HEADERS       += filter_sampling.h \
-				../../meshlab/meshmodel.h \
 		$$VCGDIR/vcg/complex/trimesh/point_sampling.h
 				
-SOURCES       += filter_sampling.cpp\
-				../../meshlab/meshmodel.cpp \
-		$$GLEWCODE
-
+SOURCES       += filter_sampling.cpp
 TARGET        = filter_sampling

 CONFIG       += opengl
--- a/src/meshlabplugins/filter_select/filter_select.pro
+++ b/src/meshlabplugins/filter_select/filter_select.pro
@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)

 HEADERS       += meshselect.h
 SOURCES       += meshselect.cpp
--- a/src/meshlabplugins/filter_select/meshselect.h
+++ b/src/meshlabplugins/filter_select/meshselect.h
@ -25,11 +25,7 @@
 #define FILTER_SELECT_H

 #include <QObject>
-#include <QStringList>
-#include <QList>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>


 class SelectionFilterPlugin : public QObject, public MeshFilterInterface
--- a/src/meshlabplugins/filter_slice/filter_slice.pro
+++ b/src/meshlabplugins/filter_slice/filter_slice.pro
@ -1,19 +1,11 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)

 HEADERS       += filter_slice.h \
                filter_slice_functors.h \
-                kdtree.h \ 
-     ../../meshlab/meshmodel.h
-		
- 
-SOURCES       += filter_slice.cpp \
-                $$GLEWCODE \
-                ../../meshlab/meshmodel.cpp
-
+                kdtree.h 		
+SOURCES       += filter_slice.cpp 
 TARGET        = filter_slice

-#FORMS	      = svgpro.ui
-
 QT           += opengl


--- a/src/meshlabplugins/filter_unsharp/filter_unsharp.h
+++ b/src/meshlabplugins/filter_unsharp/filter_unsharp.h
@ -24,11 +24,7 @@
 #define FilterUnsharp_PLUGIN_H

 #include <QObject>
-#include <QStringList>
-#include <QString>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>


 class FilterUnsharp : public QObject, public MeshFilterInterface
--- a/src/meshlabplugins/filter_unsharp/filter_unsharp.pro
+++ b/src/meshlabplugins/filter_unsharp/filter_unsharp.pro
@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)

 HEADERS       += filter_unsharp.h \
 		$$VCGDIR/vcg/complex/trimesh/crease_cut.h
--- a/src/meshlabplugins/filter_zippering/filter_zippering.cpp
+++ b/src/meshlabplugins/filter_zippering/filter_zippering.cpp
@ -27,28 +27,16 @@
 ****************************************************************************/

 #include <QtGui>
-#include <cmath>
-#include <time.h>
+#include "filter_zippering.h"

-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
-
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/flag.h>
 #include <vcg/simplex/face/topology.h>
 #include <vcg/simplex/face/pos.h>
-#include <vcg/simplex/vertex/component_ocf.h>
-#include <vcg/complex/trimesh/allocate.h>
 #include <vcg/complex/trimesh/append.h>
 #include <vcg/complex/trimesh/clean.h>
 #include <vcg/complex/trimesh/hole.h>
-#include <vcg/complex/trimesh/update/topology.h>
 #include <vcg/space/intersection2.h>
-#include <vcg/math/matrix44.h>
 #include <wrap/gl/glu_tesselator.h>

-#include "filter_zippering.h"

 //#define REDUNDANCY_ONLY 1
 //#define REFINE_PATCH_ONLY 1
--- a/src/meshlabplugins/filter_zippering/filter_zippering.h
+++ b/src/meshlabplugins/filter_zippering/filter_zippering.h
@ -29,8 +29,7 @@

 #include <QObject>

-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>

 #include <vcg/complex/trimesh/closest.h>
 #include <vcg/space/index/grid_static_ptr.h>
--- a/src/meshlabplugins/filter_zippering/filter_zippering.pro
+++ b/src/meshlabplugins/filter_zippering/filter_zippering.pro
@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 HEADERS += filter_zippering.h
 SOURCES += filter_zippering.cpp
    
--- a/src/meshlabplugins/io_3ds/io_3ds.pro
+++ b/src/meshlabplugins/io_3ds/io_3ds.pro
@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)

 HEADERS		= meshio.h \
 			$$VCGDIR/wrap/ply/plylib.h \
--- a/src/meshlabplugins/io_3ds/meshio.h
+++ b/src/meshlabplugins/io_3ds/meshio.h
@ -27,8 +27,7 @@
 #include <QStringList>
 #include <QString>

-#include "../../meshlab/meshmodel.h"
-#include "../../meshlab/interfaces.h"
+#include <common/interfaces.h>

 class ExtraMeshIOPlugin : public QObject, public MeshIOInterface
 {
--- a/src/meshlabplugins/io_collada/io_collada.h
+++ b/src/meshlabplugins/io_collada/io_collada.h
@ -44,11 +44,7 @@
 #define COLLADAIOPLUGIN_H

 #include <QObject>
-#include <QStringList>
-#include <QString>
-
-#include "../../meshlab/meshmodel.h"
-#include "../../meshlab/interfaces.h"
+#include <common/interfaces.h>

 class ColladaIOPlugin : public QObject, public MeshIOInterface
 {
--- a/src/meshlabplugins/io_collada/io_collada.pro
+++ b/src/meshlabplugins/io_collada/io_collada.pro
@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)

 HEADERS       += io_collada.h \
 		$$VCGDIR/wrap/io_trimesh/export_dae.h \
--- a/src/meshlabplugins/io_epoch/epoch_io.h
+++ b/src/meshlabplugins/io_epoch/epoch_io.h
@ -44,11 +44,7 @@
 #define EXTRAIOPLUGINV3D_H

 #include <QObject>
-#include <QStringList>
-#include <QString>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 #include "v3dImportDialog.h"

 class EpochIO : public QObject, public MeshIOInterface
--- a/src/meshlabplugins/io_epoch/epoch_reconstruction.h
+++ b/src/meshlabplugins/io_epoch/epoch_reconstruction.h
@ -24,11 +24,9 @@
 #ifndef _EPOCH_RECONSTRUCTION_H
 #define _EPOCH_RECONSTRUCTION_H

-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomNode>
+#include <QtXml>

-#include <meshlab/meshmodel.h>
+#include <common/meshmodel.h>

 #include "radial_distortion.h"
 #include "epoch_camera.h"
--- a/src/meshlabplugins/io_epoch/io_epoch.pro
+++ b/src/meshlabplugins/io_epoch/io_epoch.pro
@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)

 TEMPLATE      = lib
 CONFIG       += plugin 
--- a/src/meshlabplugins/io_expe/io_expe.h
+++ b/src/meshlabplugins/io_expe/io_expe.h
@ -26,8 +26,7 @@

 #include <QObject>

-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>

 class ExpeIOPlugin : public QObject, public MeshIOInterface
 {
--- a/src/meshlabplugins/io_expe/io_expe.pro
+++ b/src/meshlabplugins/io_expe/io_expe.pro
@ -1,12 +1,5 @@
-include (../../sharedfilter.pri)
-
-HEADERS       += io_expe.h \
-				../../meshlab/meshmodel.h
-
-SOURCES       += io_expe.cpp \
-				../../meshlab/meshmodel.cpp \
-				$$GLEWCODE
-
+include (../../shared.pri)
+HEADERS       += io_expe.h 
+SOURCES       += io_expe.cpp 
 TARGET        = io_expe
-
 CONFIG       += opengl
--- a/src/meshlabplugins/io_gts/io_gts.h
+++ b/src/meshlabplugins/io_gts/io_gts.h
@ -26,8 +26,7 @@

 #include <QObject>

-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>

 class GtsIOPlugin : public QObject, public MeshIOInterface
 {
--- a/src/meshlabplugins/io_gts/io_gts.pro
+++ b/src/meshlabplugins/io_gts/io_gts.pro
@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)

 HEADERS       += io_gts.h

--- a/src/meshlabplugins/io_pdb/io_pdb.h
+++ b/src/meshlabplugins/io_pdb/io_pdb.h
@ -24,10 +24,8 @@
 #ifndef PDBIOPLUGIN_H
 #define PDBIOPLUGIN_H

-#include <QString>

-#include "../../meshlab/meshmodel.h"
-#include "../../meshlab/interfaces.h"
+#include <common/interfaces.h>

 class PDBIOPlugin : public QObject, public MeshIOInterface
 {
--- a/src/meshlabplugins/io_pdb/io_pdb.pro
+++ b/src/meshlabplugins/io_pdb/io_pdb.pro
@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)

 HEADERS       += io_pdb.h \
 		$$VCGDIR/wrap/ply/plylib.h 
--- a/src/meshlabplugins/io_tri/io_tri.h
+++ b/src/meshlabplugins/io_tri/io_tri.h
@ -31,8 +31,7 @@

 #include <QObject>

-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>

 class TriIOPlugin : public QObject, public MeshIOInterface
 {
--- a/src/meshlabplugins/io_tri/io_tri.pro
+++ b/src/meshlabplugins/io_tri/io_tri.pro
@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)

 HEADERS       += io_tri.h 
 				
--- a/src/meshlabplugins/io_u3d/io_u3d.h
+++ b/src/meshlabplugins/io_u3d/io_u3d.h
@ -28,8 +28,7 @@
 #include <QList>
 #include <QString>

-#include "../../meshlab/meshmodel.h"
-#include "../../meshlab/interfaces.h"
+#include <common/interfaces.h>
 #include <wrap/io_trimesh/export_u3d.h>
 #include <wrap/io_trimesh/export_idtf.h>

--- a/src/meshlabplugins/io_u3d/io_u3d.pro
+++ b/src/meshlabplugins/io_u3d/io_u3d.pro
@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 				
 HEADERS       += io_u3d.h \
 				$$VCGDIR/wrap/io_trimesh/export_u3d.h
--- a/src/meshlabplugins/io_x3d/io_x3d.h
+++ b/src/meshlabplugins/io_x3d/io_x3d.h
@ -34,8 +34,7 @@

 #include <QObject>

-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>

 class IoX3DPlugin : public QObject, public MeshIOInterface
 {
--- a/src/meshlabplugins/io_x3d/io_x3d.pro
+++ b/src/meshlabplugins/io_x3d/io_x3d.pro
@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)

 HEADERS       += io_x3d.h import_x3d.h\
 		export_x3d.h util_x3d.h \