From d535301cd14f47da973c46a52d5b91824c5e6caa Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Tue, 21 Feb 2006 17:26:38 +0000 Subject: [PATCH] RenderMode is now passed to MeshRender::Init() --- src/meshlabplugins/meshrender/meshrender.cpp | 8 ++++---- src/meshlabplugins/meshrender/meshrender.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/meshlabplugins/meshrender/meshrender.cpp b/src/meshlabplugins/meshrender/meshrender.cpp index 4569163f7..d5b8d383b 100644 --- a/src/meshlabplugins/meshrender/meshrender.cpp +++ b/src/meshlabplugins/meshrender/meshrender.cpp @@ -23,8 +23,8 @@ /**************************************************************************** History $Log$ -Revision 1.12 2006/02/21 16:10:02 ggangemi -added info() method +Revision 1.13 2006/02/21 17:26:38 ggangemi +RenderMode is now passed to MeshRender::Init() Revision 1.11 2006/02/19 02:57:49 ggangemi Now each shader can change the opengl status @@ -219,7 +219,7 @@ void MeshShaderRenderPlugin::initActionList() { } } -void MeshShaderRenderPlugin::Init(QAction *a, MeshModel &m, GLArea *gla) +void MeshShaderRenderPlugin::Init(QAction *a, MeshModel &m, RenderMode &rm, GLArea *gla) { if (sDialog) sDialog->close(); @@ -290,7 +290,7 @@ void MeshShaderRenderPlugin::Init(QAction *a, MeshModel &m, GLArea *gla) "or the shader's code\n\n"); } - sDialog = new ShaderDialog(&shaders[a->text()], gla); + sDialog = new ShaderDialog(&shaders[a->text()], gla, rm); sDialog->show(); } else { diff --git a/src/meshlabplugins/meshrender/meshrender.h b/src/meshlabplugins/meshrender/meshrender.h index 4ea9caf06..4a282ca49 100644 --- a/src/meshlabplugins/meshrender/meshrender.h +++ b/src/meshlabplugins/meshrender/meshrender.h @@ -23,8 +23,8 @@ /**************************************************************************** History $Log$ -Revision 1.15 2006/02/21 16:10:02 ggangemi -added info() method +Revision 1.16 2006/02/21 17:26:38 ggangemi +RenderMode is now passed to MeshRender::Init() Revision 1.14 2006/02/19 02:57:49 ggangemi Now each shader can change the opengl status @@ -121,7 +121,7 @@ public: virtual const PluginInfo &Info(); virtual bool isSupported() {return supported;} - virtual void Init(QAction *a, MeshModel &m, GLArea *gla); + virtual void Init(QAction *a, MeshModel &m, RenderMode &rm, GLArea *gla); virtual void Render(QAction *a, MeshModel &m, RenderMode &rm, GLArea *gla); };