From 92a6d4e0b1cfecbc5656177008d6e62fc0da58a8 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 27 Jan 2021 15:30:03 +0100 Subject: [PATCH] file reorganization --- src/common/CMakeLists.txt | 6 +-- src/common/common.pro | 6 +-- src/common/{globals => }/globals.cpp | 21 +++++--- src/common/{globals => }/globals.h | 5 +- src/common/globals/singletons.cpp | 18 ------- src/common/globals/singletons.h | 52 ------------------- src/common/plugin_manager.cpp | 2 +- src/meshlab/dialogs/filter_script_dialog.cpp | 6 +-- src/meshlab/mainwindow_Init.cpp | 5 +- src/meshlab/mainwindow_RunTime.cpp | 2 +- .../decorate_shadow/shadow_mapping.cpp | 2 +- src/meshlabplugins/decorate_shadow/ssao.cpp | 2 +- .../variance_shadow_mapping.cpp | 2 +- .../variance_shadow_mapping_blur.cpp | 2 +- 14 files changed, 33 insertions(+), 98 deletions(-) rename src/common/{globals => }/globals.cpp (94%) rename src/common/{globals => }/globals.h (96%) delete mode 100644 src/common/globals/singletons.cpp delete mode 100644 src/common/globals/singletons.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index d8f2a0b4b..9c361db82 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -8,8 +8,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../ML_VERSION") endif() set(HEADERS - globals/globals.h - globals/singletons.h + globals.h interfaces/decorate_plugin_interface.h interfaces/edit_plugin_interface.h interfaces/filter_plugin_interface.h @@ -45,8 +44,7 @@ set(HEADERS searcher.h) set(SOURCES - globals/globals.cpp - globals/singletons.cpp + globals.cpp interfaces/decorate_plugin_interface.cpp interfaces/filter_plugin_interface.cpp interfaces/plugin_interface.cpp diff --git a/src/common/common.pro b/src/common/common.pro index 305afc04e..035962410 100644 --- a/src/common/common.pro +++ b/src/common/common.pro @@ -40,8 +40,7 @@ exists(../../ML_VERSION){ # Input HEADERS += \ - globals/globals.h \ - globals/singletons.h \ + globals.h \ interfaces/decorate_plugin_interface.h \ interfaces/edit_plugin_interface.h \ interfaces/filter_plugin_interface.h \ @@ -74,8 +73,7 @@ HEADERS += \ meshlabdocumentxml.h SOURCES += \ - globals/globals.cpp \ - globals/singletons.cpp \ + globals.cpp \ interfaces/decorate_plugin_interface.cpp \ interfaces/filter_plugin_interface.cpp \ interfaces/plugin_interface.cpp \ diff --git a/src/common/globals/globals.cpp b/src/common/globals.cpp similarity index 94% rename from src/common/globals/globals.cpp rename to src/common/globals.cpp index 542c2392e..a9387c772 100644 --- a/src/common/globals/globals.cpp +++ b/src/common/globals.cpp @@ -26,13 +26,8 @@ #include #include -#include "../parameters/rich_parameter_list.h" - -RichParameterList& meshlab::defaultGlobalParameterList() -{ - static RichParameterList globalRPS; - return globalRPS; -} +#include "parameters/rich_parameter_list.h" +#include "plugin_manager.h" QString basePath() { @@ -107,3 +102,15 @@ QString meshlab::defaultShadersPath() { return basePath() + "/shaders"; } + +RichParameterList& meshlab::defaultGlobalParameterList() +{ + static RichParameterList globalRPS; + return globalRPS; +} + +PluginManager& meshlab::pluginManagerInstance(bool verbose) +{ + static PluginManager pm(defaultGlobalParameterList(), verbose); + return pm; +} diff --git a/src/common/globals/globals.h b/src/common/globals.h similarity index 96% rename from src/common/globals/globals.h rename to src/common/globals.h index 65b6855d1..7246cb38a 100644 --- a/src/common/globals/globals.h +++ b/src/common/globals.h @@ -27,13 +27,16 @@ #include class RichParameterList; +class PluginManager; namespace meshlab { -RichParameterList& defaultGlobalParameterList(); QString defaultPluginPath(); QString defaultShadersPath(); +RichParameterList& defaultGlobalParameterList(); +PluginManager& pluginManagerInstance(bool verbose = true); + } #endif // MESHLAB_GLOBALS_H diff --git a/src/common/globals/singletons.cpp b/src/common/globals/singletons.cpp deleted file mode 100644 index 000ef4b55..000000000 --- a/src/common/globals/singletons.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "singletons.h" - -#include "../plugin_manager.h" -#include "globals.h" - -namespace meshlab { - -MeshLabSingletons::MeshLabSingletons() -{ -} - -PluginManager& MeshLabSingletons::pluginManagerInstance(bool verbose) -{ - static PluginManager pm(defaultGlobalParameterList(), verbose); - return pm; -} - -} //namespace meshlab diff --git a/src/common/globals/singletons.h b/src/common/globals/singletons.h deleted file mode 100644 index 3dc834d12..000000000 --- a/src/common/globals/singletons.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -* MeshLab o o * -* A versatile mesh processing toolbox o o * -* _ O _ * -* Copyright(C) 2005-2020 \/)\/ * -* Visual Computing Lab /\/| * -* ISTI - Italian National Research Council | * -* \ * -* All rights reserved. * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * -* for more details. * -* * -****************************************************************************/ - -#ifndef MESHLAB_SINGLETONS_H -#define MESHLAB_SINGLETONS_H - -class RichParameterList; -class PluginManager; - -namespace meshlab { - -/** - * @brief The MeshLabSingletons class - * This class contains all the singleton instances used on MeshLab. - * - pluginManager - * - defaultGlobalParameterList - */ -class MeshLabSingletons -{ -public: - /** Singleton Instances **/ - static PluginManager& pluginManagerInstance(bool verbose = true); - - MeshLabSingletons(MeshLabSingletons const&) = delete; - void operator=(MeshLabSingletons const&) = delete; -private: - MeshLabSingletons(); -}; - -} - -#endif // MESHLAB_SINGLETONS_H diff --git a/src/common/plugin_manager.cpp b/src/common/plugin_manager.cpp index d1c420c36..39ce461d7 100644 --- a/src/common/plugin_manager.cpp +++ b/src/common/plugin_manager.cpp @@ -29,7 +29,7 @@ #include #include "mlexception.h" -#include "globals/globals.h" +#include "globals.h" static QStringList fileNamePluginDLLs() { QStringList l; diff --git a/src/meshlab/dialogs/filter_script_dialog.cpp b/src/meshlab/dialogs/filter_script_dialog.cpp index 29c12dcef..924b0663c 100644 --- a/src/meshlab/dialogs/filter_script_dialog.cpp +++ b/src/meshlab/dialogs/filter_script_dialog.cpp @@ -26,8 +26,8 @@ #include "ui_filter_script_dialog.h" #include "filter_script_dialog.h" #include "mainwindow.h" -#include "../common/mlexception.h" -#include "../common/globals/singletons.h" +#include +#include #include "rich_parameter_gui/richparameterlistdialog.h" FilterScriptDialog::FilterScriptDialog(FilterScript& fs, QWidget * parent): @@ -199,7 +199,7 @@ void FilterScriptDialog::editOldParameters( const int row ) //get a pointer to this action and filter from the main window so we can get the //description of the parameters from the filter - QAction *action = meshlab::MeshLabSingletons::pluginManagerInstance().filterAction(actionName); + QAction *action = meshlab::pluginManagerInstance().filterAction(actionName); FilterPluginInterface *iFilter = qobject_cast(action->parent()); if(NULL == iFilter){ diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 8c51d3fab..2f5bc639b 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -39,8 +39,7 @@ #include #include #include -#include -#include +#include #include "dialogs/options_dialog.h" #include "dialogs/save_snapshot_dialog.h" #include "dialogs/congrats_dialog.h" @@ -52,7 +51,7 @@ MainWindow::MainWindow(): httpReq(this), gpumeminfo(NULL), defaultGlobalParams(meshlab::defaultGlobalParameterList()), - PM(meshlab::MeshLabSingletons::pluginManagerInstance()), + PM(meshlab::pluginManagerInstance()), _currviewcontainer(NULL) { setContextMenuPolicy(Qt::NoContextMenu); diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index ae93bb6d4..967b9fbb8 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include "rich_parameter_gui/richparameterlistdialog.h" diff --git a/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp b/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp index 50574894f..5a6923762 100644 --- a/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp +++ b/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp @@ -24,7 +24,7 @@ #include #include "decorate_shader.h" #include "shadow_mapping.h" -#include +#include ShadowMapping::ShadowMapping(float intensity):DecorateShader() diff --git a/src/meshlabplugins/decorate_shadow/ssao.cpp b/src/meshlabplugins/decorate_shadow/ssao.cpp index c11bf44a1..f43f701ce 100644 --- a/src/meshlabplugins/decorate_shadow/ssao.cpp +++ b/src/meshlabplugins/decorate_shadow/ssao.cpp @@ -24,7 +24,7 @@ #include #include "ssao.h" -#include +#include SSAO::SSAO(float radius):DecorateShader() { diff --git a/src/meshlabplugins/decorate_shadow/variance_shadow_mapping.cpp b/src/meshlabplugins/decorate_shadow/variance_shadow_mapping.cpp index 5b1b4ae2b..a0d1e0058 100644 --- a/src/meshlabplugins/decorate_shadow/variance_shadow_mapping.cpp +++ b/src/meshlabplugins/decorate_shadow/variance_shadow_mapping.cpp @@ -23,7 +23,7 @@ #include "decorate_shader.h" #include "variance_shadow_mapping.h" -#include +#include #include diff --git a/src/meshlabplugins/decorate_shadow/variance_shadow_mapping_blur.cpp b/src/meshlabplugins/decorate_shadow/variance_shadow_mapping_blur.cpp index 438c2f500..9fb6378d7 100644 --- a/src/meshlabplugins/decorate_shadow/variance_shadow_mapping_blur.cpp +++ b/src/meshlabplugins/decorate_shadow/variance_shadow_mapping_blur.cpp @@ -24,7 +24,7 @@ #include #include "decorate_shader.h" #include "variance_shadow_mapping_blur.h" -#include +#include VarianceShadowMappingBlur::VarianceShadowMappingBlur(float intensity):VarianceShadowMapping(intensity) {