Remove GLContext include from mesh_model

lvk88 · Aug 16, 2024 · 15c56d7 · 15c56d7
1 parent edce0e6
commit 15c56d7
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 1 deletion.
diff --git a/src/common/ml_document/mesh_model.h b/src/common/ml_document/mesh_model.h
@@ -32,7 +32,7 @@
 #include "cmesh.h"
 #include "../GLLogStream.h"
 #include "../filterscript.h"
-#include "../ml_shared_data_context/ml_plugin_gl_context.h"
+//#include "../ml_shared_data_context/ml_plugin_gl_context.h"
 
 #include <vcg/complex/algorithms/update/bounding.h>
 #include <vcg/complex/algorithms/update/color.h>

diff --git a/src/common/ml_selection_buffers.cpp b/src/common/ml_selection_buffers.cpp
@@ -1,5 +1,7 @@
 #include "ml_selection_buffers.h"
 
+#include "vcglib/wrap/gl/deprecated_math.h"
+
 MLSelectionBuffers::MLSelectionBuffers(MeshModel& m,unsigned int primitivebatch)
 	:_lock(),_m(m),_primitivebatch(primitivebatch),_selmap(2)
 {

diff --git a/src/common/plugins/interfaces/edit_plugin.h b/src/common/plugins/interfaces/edit_plugin.h
@@ -30,6 +30,9 @@
 #include "meshlab_plugin.h"
 #include "../../ml_document/mesh_document.h"
 
+class MLRenderingData;
+class MLSceneGLSharedDataContext;
+
 
 class GLArea;
 

diff --git a/src/common/plugins/interfaces/filter_plugin.h b/src/common/plugins/interfaces/filter_plugin.h
@@ -37,6 +37,8 @@ Q_DECLARE_METATYPE(Matrix33m)
 Q_DECLARE_METATYPE(Matrix44m)
 Q_DECLARE_METATYPE(Eigen::VectorXd)
 
+class MLPluginGLContext;
+
 /**
  * @brief The FilterPlugin class provide the interface of the filter plugins.
  */

diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp
@@ -47,6 +47,7 @@
 #include <common/mlexception.h>
 #include <common/globals.h>
 #include <common/utilities/load_save.h>
+#include <common/ml_shared_data_context/ml_plugin_gl_context.h>
 
 #include <common_gui/rich_parameter/richparameterlistdialog.h>
 

diff --git a/src/meshlab/multiViewer_Container.h b/src/meshlab/multiViewer_Container.h
@@ -38,6 +38,7 @@
 class GLArea;
 class RichParameterList;
 class MultiViewer_Container;
+class MLSceneGLSharedDataContext;
 
 class Splitter : public QSplitter
 {

diff --git a/src/meshlabplugins/filter_ao/filter_ao.cpp b/src/meshlabplugins/filter_ao/filter_ao.cpp
@@ -22,6 +22,7 @@
 ****************************************************************************/
 
 #include <common/GLExtensionsManager.h>
+#include <common/ml_shared_data_context/ml_plugin_gl_context.h>
 #include "filter_ao.h"
 #include <QGLFramebufferObject>
 #include <QElapsedTimer>

diff --git a/src/meshlabplugins/filter_color_projection/render_helper.cpp b/src/meshlabplugins/filter_color_projection/render_helper.cpp
@@ -23,6 +23,8 @@
 
 #include <common/GLExtensionsManager.h>
 #include <common/ml_document/mesh_model.h>
+#include <common/ml_shared_data_context/ml_plugin_gl_context.h>
+#include <common/ml_shared_data_context/ml_shared_data_context.h>
 
 #include <QObject>
 #include <QGLContext>

diff --git a/src/meshlabplugins/filter_mutualglobal/filter_mutualglobal.cpp b/src/meshlabplugins/filter_mutualglobal/filter_mutualglobal.cpp
@@ -23,6 +23,7 @@
 
 #include "filter_mutualglobal.h"
 #include <common/GLExtensionsManager.h>
+#include <common/ml_shared_data_context/ml_plugin_gl_context.h>
 
 #include "alignset.h"
 

diff --git a/src/meshlabplugins/filter_mutualinfo/alignset.cpp b/src/meshlabplugins/filter_mutualinfo/alignset.cpp
@@ -2,6 +2,9 @@
 
 #include <GL/glew.h>
 
+#include <common/ml_shared_data_context/ml_plugin_gl_context.h>
+#include <common/ml_shared_data_context/ml_shared_data_context.h>
+
 #include <QGLContext>
 #include <QDomNode>
 #include <QDir>

diff --git a/src/meshlabplugins/filter_mutualinfo/alignset.h b/src/meshlabplugins/filter_mutualinfo/alignset.h
@@ -18,6 +18,7 @@
 #include "pointCorrespondence.h"
 
 class QGLFramebufferObject;
+class MLPluginGLContext;
 
 class AlignSet {
   //typedef vcg::Camera<float> Camera;

diff --git a/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.cpp b/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.cpp
@@ -23,6 +23,7 @@
 
 #include "filter_mutualinfo.h"
 #include <common/GLExtensionsManager.h>
+#include <common/ml_shared_data_context/ml_plugin_gl_context.h>
 
 #include "alignset.h"
 

diff --git a/src/meshlabplugins/filter_sample_gpu/filter_sample_gpu.cpp b/src/meshlabplugins/filter_sample_gpu/filter_sample_gpu.cpp
@@ -23,6 +23,8 @@
 
 #include "filter_sample_gpu.h"
 #include <common/GLExtensionsManager.h>
+#include <common/ml_shared_data_context/ml_plugin_gl_context.h>
+#include <common/ml_shared_data_context/ml_shared_data_context.h>
 #include <wrap/glw/glw.h>
 #include <QImage>
 

diff --git a/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.cpp b/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.cpp
@@ -1,5 +1,6 @@
 #include "filter_sdfgpu.h"
 #include <common/GLExtensionsManager.h>
+#include <common/ml_shared_data_context/ml_plugin_gl_context.h>
 
 #include <vcg/complex/complex.h>
 #include <vcg/complex/algorithms/intersection.h>

diff --git a/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.cpp b/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.cpp
@@ -33,6 +33,8 @@
 #include <vcg/complex/algorithms/update/normal.h>
 
 #include <common/GLExtensionsManager.h>
+#include <common/ml_shared_data_context/ml_plugin_gl_context.h>
+#include <common/ml_shared_data_context/ml_shared_data_context.h>
 
 #include "TextureDefragmentation/src/mesh.h"
 #include "TextureDefragmentation/src/texture_object.h"

diff --git a/src/meshlabplugins/io_base/load_project.h b/src/meshlabplugins/io_base/load_project.h
@@ -2,6 +2,7 @@
 #define LOAD_PROJECT_H
 
 #include <common/ml_document/mesh_model.h>
+#include <common/ml_shared_data_context/ml_shared_data_context.h>
 
 std::vector<MeshModel*> loadALN(
 		const QString& filename,

diff --git a/src/meshlabplugins/io_base/save_project.h b/src/meshlabplugins/io_base/save_project.h
@@ -3,6 +3,8 @@
 
 #include <common/ml_document/mesh_document.h>
 
+#include <common/ml_shared_data_context/ml_shared_data_context.h>
+
 void saveMLP(
 		const QString& filename,
 		const MeshDocument& md,