From c37cd6c5948843512d7693dcd92f7ebd5ae2ea70 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Tue, 21 Apr 2020 19:00:34 +0200 Subject: [PATCH] sample_dyn, sample_gpu, sample_geodesic and sample_iso moved to meshlabplugins --- src/CMakeLists.txt | 8 ++++---- src/meshlab.pro | 16 ++++++++-------- .../filter_createiso/CMakeLists.txt | 0 .../filter_createiso/filter_createiso.cpp | 0 .../filter_createiso/filter_createiso.h | 0 .../filter_createiso/filter_createiso.pro | 0 .../filter_geodesic/CMakeLists.txt | 0 .../filter_geodesic/filter_geodesic.cpp | 0 .../filter_geodesic/filter_geodesic.h | 0 .../filter_geodesic/filter_geodesic.pro | 0 .../filter_sample_dyn}/CMakeLists.txt | 0 .../filter_sample_dyn/filter_sample_dyn.pro} | 0 .../filter_sample_dyn}/samplefilterdyn.cpp | 0 .../filter_sample_dyn}/samplefilterdyn.h | 0 .../filter_sample_gpu}/CMakeLists.txt | 0 .../filter_sample_gpu/filter_sample_gpu.pro} | 0 .../filter_sample_gpu}/sample_filtergpu.cpp | 0 .../filter_sample_gpu}/sample_filtergpu.h | 0 18 files changed, 12 insertions(+), 12 deletions(-) rename src/{sampleplugins => meshlabplugins}/filter_createiso/CMakeLists.txt (100%) rename src/{sampleplugins => meshlabplugins}/filter_createiso/filter_createiso.cpp (100%) rename src/{sampleplugins => meshlabplugins}/filter_createiso/filter_createiso.h (100%) rename src/{sampleplugins => meshlabplugins}/filter_createiso/filter_createiso.pro (100%) rename src/{sampleplugins => meshlabplugins}/filter_geodesic/CMakeLists.txt (100%) rename src/{sampleplugins => meshlabplugins}/filter_geodesic/filter_geodesic.cpp (100%) rename src/{sampleplugins => meshlabplugins}/filter_geodesic/filter_geodesic.h (100%) rename src/{sampleplugins => meshlabplugins}/filter_geodesic/filter_geodesic.pro (100%) rename src/{sampleplugins/samplefilterdyn => meshlabplugins/filter_sample_dyn}/CMakeLists.txt (100%) rename src/{sampleplugins/samplefilterdyn/samplefilterdyn.pro => meshlabplugins/filter_sample_dyn/filter_sample_dyn.pro} (100%) rename src/{sampleplugins/samplefilterdyn => meshlabplugins/filter_sample_dyn}/samplefilterdyn.cpp (100%) rename src/{sampleplugins/samplefilterdyn => meshlabplugins/filter_sample_dyn}/samplefilterdyn.h (100%) rename src/{sampleplugins/sample_filtergpu => meshlabplugins/filter_sample_gpu}/CMakeLists.txt (100%) rename src/{sampleplugins/sample_filtergpu/sample_filtergpu.pro => meshlabplugins/filter_sample_gpu/filter_sample_gpu.pro} (100%) rename src/{sampleplugins/sample_filtergpu => meshlabplugins/filter_sample_gpu}/sample_filtergpu.cpp (100%) rename src/{sampleplugins/sample_filtergpu => meshlabplugins/filter_sample_gpu}/sample_filtergpu.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8380f1f8a..9274f8e79 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -262,10 +262,10 @@ else() # Sample Plugins meshlabplugins/edit_sample meshlabplugins/filter_sample - sampleplugins/samplefilterdyn - sampleplugins/filter_createiso - sampleplugins/filter_geodesic - sampleplugins/sample_filtergpu) + meshlabplugins/filter_sample_dyn + meshlabplugins/filter_createiso + meshlabplugins/filter_geodesic + meshlabplugins/filter_sample_gpu) endif() function(meshlab_install_plugin_xml FN OUTVAR) diff --git a/src/meshlab.pro b/src/meshlab.pro index d6c13567d..0c0e7e5ce 100644 --- a/src/meshlab.pro +++ b/src/meshlab.pro @@ -52,10 +52,10 @@ SUBDIRS += \ #sub projects names # Filter samples edit_sample \ filter_sample \ - samplefilterdyn \ + filter_sample_dyn \ filter_createiso \ filter_geodesic \ - sample_filtergpu \ + filter_sample_gpu \ # Filter plugins filter_ao \ filter_camera \ @@ -139,10 +139,10 @@ io_u3d.subdir = meshlabplugins/io_u3d # Filter samples edit_sample.subdir = meshlabplugins/edit_sample filter_sample.subdir = meshlabplugins/filter_sample -samplefilterdyn.subdir = sampleplugins/samplefilterdyn -filter_createiso.subdir = sampleplugins/filter_createiso -filter_geodesic.subdir = sampleplugins/filter_geodesic -sample_filtergpu.subdir = sampleplugins/sample_filtergpu +filter_sample_dyn.subdir = meshlabplugins/filter_sample_dyn +filter_createiso.subdir = meshlabplugins/filter_createiso +filter_geodesic.subdir = meshlabplugins/filter_geodesic +filter_sample_gpu.subdir = meshlabplugins/filter_sample_gpu # Filter plugins filter_ao.subdir = meshlabplugins/filter_ao filter_camera.subdir = meshlabplugins/filter_camera @@ -214,10 +214,10 @@ io_u3d.depends = common # Filter samples edit_sample.depends = common filter_sample.depends = common -samplefilterdyn.depends = common +filter_sample_dyn.depends = common filter_createiso.depends = common filter_geodesic.depends = common -sample_filtergpu.depends = common +filter_sample_gpu.depends = common # Filter plugins filter_ao.depends = common filter_camera.depends = common diff --git a/src/sampleplugins/filter_createiso/CMakeLists.txt b/src/meshlabplugins/filter_createiso/CMakeLists.txt similarity index 100% rename from src/sampleplugins/filter_createiso/CMakeLists.txt rename to src/meshlabplugins/filter_createiso/CMakeLists.txt diff --git a/src/sampleplugins/filter_createiso/filter_createiso.cpp b/src/meshlabplugins/filter_createiso/filter_createiso.cpp similarity index 100% rename from src/sampleplugins/filter_createiso/filter_createiso.cpp rename to src/meshlabplugins/filter_createiso/filter_createiso.cpp diff --git a/src/sampleplugins/filter_createiso/filter_createiso.h b/src/meshlabplugins/filter_createiso/filter_createiso.h similarity index 100% rename from src/sampleplugins/filter_createiso/filter_createiso.h rename to src/meshlabplugins/filter_createiso/filter_createiso.h diff --git a/src/sampleplugins/filter_createiso/filter_createiso.pro b/src/meshlabplugins/filter_createiso/filter_createiso.pro similarity index 100% rename from src/sampleplugins/filter_createiso/filter_createiso.pro rename to src/meshlabplugins/filter_createiso/filter_createiso.pro diff --git a/src/sampleplugins/filter_geodesic/CMakeLists.txt b/src/meshlabplugins/filter_geodesic/CMakeLists.txt similarity index 100% rename from src/sampleplugins/filter_geodesic/CMakeLists.txt rename to src/meshlabplugins/filter_geodesic/CMakeLists.txt diff --git a/src/sampleplugins/filter_geodesic/filter_geodesic.cpp b/src/meshlabplugins/filter_geodesic/filter_geodesic.cpp similarity index 100% rename from src/sampleplugins/filter_geodesic/filter_geodesic.cpp rename to src/meshlabplugins/filter_geodesic/filter_geodesic.cpp diff --git a/src/sampleplugins/filter_geodesic/filter_geodesic.h b/src/meshlabplugins/filter_geodesic/filter_geodesic.h similarity index 100% rename from src/sampleplugins/filter_geodesic/filter_geodesic.h rename to src/meshlabplugins/filter_geodesic/filter_geodesic.h diff --git a/src/sampleplugins/filter_geodesic/filter_geodesic.pro b/src/meshlabplugins/filter_geodesic/filter_geodesic.pro similarity index 100% rename from src/sampleplugins/filter_geodesic/filter_geodesic.pro rename to src/meshlabplugins/filter_geodesic/filter_geodesic.pro diff --git a/src/sampleplugins/samplefilterdyn/CMakeLists.txt b/src/meshlabplugins/filter_sample_dyn/CMakeLists.txt similarity index 100% rename from src/sampleplugins/samplefilterdyn/CMakeLists.txt rename to src/meshlabplugins/filter_sample_dyn/CMakeLists.txt diff --git a/src/sampleplugins/samplefilterdyn/samplefilterdyn.pro b/src/meshlabplugins/filter_sample_dyn/filter_sample_dyn.pro similarity index 100% rename from src/sampleplugins/samplefilterdyn/samplefilterdyn.pro rename to src/meshlabplugins/filter_sample_dyn/filter_sample_dyn.pro diff --git a/src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp b/src/meshlabplugins/filter_sample_dyn/samplefilterdyn.cpp similarity index 100% rename from src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp rename to src/meshlabplugins/filter_sample_dyn/samplefilterdyn.cpp diff --git a/src/sampleplugins/samplefilterdyn/samplefilterdyn.h b/src/meshlabplugins/filter_sample_dyn/samplefilterdyn.h similarity index 100% rename from src/sampleplugins/samplefilterdyn/samplefilterdyn.h rename to src/meshlabplugins/filter_sample_dyn/samplefilterdyn.h diff --git a/src/sampleplugins/sample_filtergpu/CMakeLists.txt b/src/meshlabplugins/filter_sample_gpu/CMakeLists.txt similarity index 100% rename from src/sampleplugins/sample_filtergpu/CMakeLists.txt rename to src/meshlabplugins/filter_sample_gpu/CMakeLists.txt diff --git a/src/sampleplugins/sample_filtergpu/sample_filtergpu.pro b/src/meshlabplugins/filter_sample_gpu/filter_sample_gpu.pro similarity index 100% rename from src/sampleplugins/sample_filtergpu/sample_filtergpu.pro rename to src/meshlabplugins/filter_sample_gpu/filter_sample_gpu.pro diff --git a/src/sampleplugins/sample_filtergpu/sample_filtergpu.cpp b/src/meshlabplugins/filter_sample_gpu/sample_filtergpu.cpp similarity index 100% rename from src/sampleplugins/sample_filtergpu/sample_filtergpu.cpp rename to src/meshlabplugins/filter_sample_gpu/sample_filtergpu.cpp diff --git a/src/sampleplugins/sample_filtergpu/sample_filtergpu.h b/src/meshlabplugins/filter_sample_gpu/sample_filtergpu.h similarity index 100% rename from src/sampleplugins/sample_filtergpu/sample_filtergpu.h rename to src/meshlabplugins/filter_sample_gpu/sample_filtergpu.h