From b859838b15584d0296df80eeaec2ef3d917044e5 Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia granzuglia Date: Wed, 31 Aug 2016 18:20:22 +0000 Subject: [PATCH] - various changes derived from the new MeshRenderInterface interface definition --- .../render_radiance_scaling/radianceScalingRenderer.cpp | 4 ++-- .../render_radiance_scaling/radianceScalingRenderer.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.cpp b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.cpp index 82b3ec592..b32a04433 100644 --- a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.cpp +++ b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.cpp @@ -53,7 +53,7 @@ RadianceScalingRendererPlugin::RadianceScalingRendererPlugin() } -void RadianceScalingRendererPlugin::Init(QAction *, MeshDocument &, GLArea *gla) { +void RadianceScalingRendererPlugin::Init(QAction *, MeshDocument &, MLSceneGLSharedDataContext::PerMeshRenderingDataMap& /*mp*/, GLArea *gla) { if (_sDialog) { _sDialog->close(); delete _sDialog; @@ -93,7 +93,7 @@ void RadianceScalingRendererPlugin::Init(QAction *, MeshDocument &, GLArea *gla) GL_TEST_ERR } -void RadianceScalingRendererPlugin::Render(QAction *, MeshDocument &md, GLArea *gla) +void RadianceScalingRendererPlugin::Render(QAction *, MeshDocument &md, MLSceneGLSharedDataContext::PerMeshRenderingDataMap& /*mp*/, GLArea *gla) { if (gla == NULL) return; diff --git a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h index 0aeab1c87..4a30cbf61 100644 --- a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h +++ b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h @@ -55,9 +55,9 @@ class RadianceScalingRendererPlugin : public QObject, public MeshRenderInterface void initActionList(); virtual bool isSupported() {return _supported;} - virtual void Init(QAction *a, MeshDocument &m, GLArea *gla); + virtual void Init(QAction *a, MeshDocument &m, MLSceneGLSharedDataContext::PerMeshRenderingDataMap& mp, GLArea *gla); virtual void Finalize(QAction *a, MeshDocument *m, GLArea * gla); - virtual void Render(QAction *a, MeshDocument &m, GLArea *gla); + virtual void Render(QAction *a, MeshDocument &m, MLSceneGLSharedDataContext::PerMeshRenderingDataMap& mp, GLArea *gla); inline void setEnable(bool enabled); inline void setLit(bool lit);