From b723ead4eb2cdcb57f54f63347c03ddf91a414dc Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia granzuglia Date: Mon, 19 Mar 2012 22:14:00 +0000 Subject: [PATCH] compiler errors removed. from Render to render --- .../decorate_background/decorate_background.cpp | 2 +- .../decorate_raster_proj/decorate_raster_proj.cpp | 4 ++-- src/meshlabplugins/decorate_shadow/shadow_mapping.cpp | 4 ++-- src/meshlabplugins/decorate_shadow/ssao.cpp | 2 +- .../decorate_shadow/variance_shadow_mapping.cpp | 4 ++-- .../decorate_shadow/variance_shadow_mapping_blur.cpp | 4 ++-- src/meshlabplugins/edit_align/AlignPairWidget.cpp | 4 ++-- src/meshlabplugins/edit_align/edit_align.cpp | 4 ++-- src/meshlabplugins/filter_measure/filter_measure.h | 2 +- src/meshlabplugins/render_gdp/meshrender.cpp | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/meshlabplugins/decorate_background/decorate_background.cpp b/src/meshlabplugins/decorate_background/decorate_background.cpp index 951867c8e..96b882e61 100644 --- a/src/meshlabplugins/decorate_background/decorate_background.cpp +++ b/src/meshlabplugins/decorate_background/decorate_background.cpp @@ -294,7 +294,7 @@ void DrawFlatMesh(MeshModel &m, int axis, int side, scale[axis]=0; glTranslate(trans); glScale(scale); - m.Render(GLW::DMFlat,GLW::CMNone,GLW::TMNone); + m.render(GLW::DMFlat,GLW::CMNone,GLW::TMNone); glPopMatrix(); glPopAttrib(); } diff --git a/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp b/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp index d19dd8b34..26e452a2d 100644 --- a/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp +++ b/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp @@ -52,7 +52,7 @@ void DecorateRasterProjPlugin::MeshDrawer::drawShadow() glPopAttrib(); } else - m_Mesh->Render( vcg::GLW::DMFlat, vcg::GLW::CMNone, vcg::GLW::TMNone ); + m_Mesh->render( vcg::GLW::DMFlat, vcg::GLW::CMNone, vcg::GLW::TMNone ); } @@ -76,7 +76,7 @@ void DecorateRasterProjPlugin::MeshDrawer::draw() glPopAttrib(); } else - m_Mesh->Render( vcg::GLW::DMSmooth, vcg::GLW::CMNone, vcg::GLW::TMNone ); + m_Mesh->render( vcg::GLW::DMSmooth, vcg::GLW::CMNone, vcg::GLW::TMNone ); } diff --git a/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp b/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp index 11bbffbcd..5179b03dd 100644 --- a/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp +++ b/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp @@ -135,7 +135,7 @@ void ShadowMapping::runShader(MeshDocument& md, GLArea* gla){ foreach(MeshModel *m, md.meshList) if(m->visible) { - m->Render(vcg::GLW::DMFlat, vcg::GLW::CMNone,vcg::GLW::TMNone); + m->render(vcg::GLW::DMFlat, vcg::GLW::CMNone,vcg::GLW::TMNone); } glDisable(GL_POLYGON_OFFSET_FILL); @@ -171,7 +171,7 @@ void ShadowMapping::runShader(MeshDocument& md, GLArea* gla){ foreach(MeshModel *m, md.meshList) if(m->visible) { - m->Render(rm.drawMode, rm.colorMode, vcg::GLW::TMNone); + m->render(rm.drawMode, rm.colorMode, vcg::GLW::TMNone); } glDisable(GL_BLEND); glDepthFunc((GLenum)depthFuncOld); diff --git a/src/meshlabplugins/decorate_shadow/ssao.cpp b/src/meshlabplugins/decorate_shadow/ssao.cpp index 605576add..8163b0711 100644 --- a/src/meshlabplugins/decorate_shadow/ssao.cpp +++ b/src/meshlabplugins/decorate_shadow/ssao.cpp @@ -127,7 +127,7 @@ void SSAO::runShader(MeshDocument& md, GLArea* gla){ foreach(MeshModel *m, md.meshList) if(m->visible) { - m->Render(vcg::GLW::DMFlat, vcg::GLW::CMNone, vcg::GLW::TMNone); + m->render(vcg::GLW::DMFlat, vcg::GLW::CMNone, vcg::GLW::TMNone); } glUseProgram(0); diff --git a/src/meshlabplugins/decorate_shadow/variance_shadow_mapping.cpp b/src/meshlabplugins/decorate_shadow/variance_shadow_mapping.cpp index 1d3c01445..0dcf2d808 100644 --- a/src/meshlabplugins/decorate_shadow/variance_shadow_mapping.cpp +++ b/src/meshlabplugins/decorate_shadow/variance_shadow_mapping.cpp @@ -89,7 +89,7 @@ void VarianceShadowMapping::runShader(MeshDocument& md, GLArea* gla){ foreach(MeshModel *m, md.meshList) if(m->visible) { - m->Render(rm.drawMode, vcg::GLW::CMNone, vcg::GLW::TMNone); + m->render(rm.drawMode, vcg::GLW::CMNone, vcg::GLW::TMNone); } glDisable(GL_POLYGON_OFFSET_FILL); @@ -128,7 +128,7 @@ void VarianceShadowMapping::runShader(MeshDocument& md, GLArea* gla){ foreach(MeshModel *m, md.meshList) if(m->visible) { - m->Render(rm.drawMode, vcg::GLW::CMNone, vcg::GLW::TMNone); + m->render(rm.drawMode, vcg::GLW::CMNone, vcg::GLW::TMNone); } glDisable(GL_BLEND); diff --git a/src/meshlabplugins/decorate_shadow/variance_shadow_mapping_blur.cpp b/src/meshlabplugins/decorate_shadow/variance_shadow_mapping_blur.cpp index 3a1bfaa89..cab73528c 100644 --- a/src/meshlabplugins/decorate_shadow/variance_shadow_mapping_blur.cpp +++ b/src/meshlabplugins/decorate_shadow/variance_shadow_mapping_blur.cpp @@ -94,7 +94,7 @@ void VarianceShadowMappingBlur::runShader(MeshDocument& md, GLArea* gla){ foreach(MeshModel *m, md.meshList) if(m->visible) { - m->Render(rm.drawMode, vcg::GLW::CMNone, vcg::GLW::TMNone); + m->render(rm.drawMode, vcg::GLW::CMNone, vcg::GLW::TMNone); } glDisable(GL_POLYGON_OFFSET_FILL); @@ -174,7 +174,7 @@ void VarianceShadowMappingBlur::runShader(MeshDocument& md, GLArea* gla){ foreach(MeshModel *m, md.meshList) if(m->visible) { - m->Render(rm.drawMode, vcg::GLW::CMNone, vcg::GLW::TMNone); + m->render(rm.drawMode, vcg::GLW::CMNone, vcg::GLW::TMNone); } glPopAttrib(); glUseProgram(0); diff --git a/src/meshlabplugins/edit_align/AlignPairWidget.cpp b/src/meshlabplugins/edit_align/AlignPairWidget.cpp index b30e9a336..581d347a1 100644 --- a/src/meshlabplugins/edit_align/AlignPairWidget.cpp +++ b/src/meshlabplugins/edit_align/AlignPairWidget.cpp @@ -112,11 +112,11 @@ void AlignPairWidget::paintGL () vcg::glTranslate(-bb.Center()); if(i==0) { - freeMesh->m->Render(localDM,localCM,vcg::GLW::TMNone); + freeMesh->m->render(localDM,localCM,vcg::GLW::TMNone); drawPickedPoints(freePickedPointVec,vcg::Color4b(vcg::Color4b::Red)); } else { foreach(MeshNode *mn, gluedTree->nodeList) - if(mn->glued && mn != freeMesh && mn->m->visible) mn->m->Render(localDM,localCM,vcg::GLW::TMNone); + if(mn->glued && mn != freeMesh && mn->m->visible) mn->m->render(localDM,localCM,vcg::GLW::TMNone); drawPickedPoints(gluedPickedPointVec,vcg::Color4b(vcg::Color4b::Blue)); } diff --git a/src/meshlabplugins/edit_align/edit_align.cpp b/src/meshlabplugins/edit_align/edit_align.cpp index 24a56c74c..f8a0453e9 100644 --- a/src/meshlabplugins/edit_align/edit_align.cpp +++ b/src/meshlabplugins/edit_align/edit_align.cpp @@ -64,7 +64,7 @@ void EditAlignPlugin::Decorate(MeshModel &m, GLArea * gla) glPushMatrix(); trackball.GetView(); trackball.Apply(true); - m.Render(GLW::DMFlat,GLW::CMPerMesh,gla->rm.textureMode); + m.render(GLW::DMFlat,GLW::CMPerMesh,gla->rm.textureMode); glPopMatrix(); break; @@ -75,7 +75,7 @@ void EditAlignPlugin::Decorate(MeshModel &m, GLArea * gla) else gla->rm.colorMode=GLW::CMPerVert; - m.Render(GLW::DMBox,GLW::CMNone,GLW::TMNone); + m.render(GLW::DMBox,GLW::CMNone,GLW::TMNone); if(alignDialog->currentArc!=0) DrawArc(alignDialog->currentArc); } diff --git a/src/meshlabplugins/filter_measure/filter_measure.h b/src/meshlabplugins/filter_measure/filter_measure.h index 957269e5b..365ffcbf9 100644 --- a/src/meshlabplugins/filter_measure/filter_measure.h +++ b/src/meshlabplugins/filter_measure/filter_measure.h @@ -35,7 +35,7 @@ class FilterMeasurePlugin : public MeshLabFilterInterface public: - FilterMeasurePlugin(){} + FilterMeasurePlugin():MeshLabFilterInterface(){} bool applyFilter( const QString& filterName,MeshDocument& md,EnvWrap& env, vcg::CallBackPos * cb ); QTreeWidgetItem *tagDump(TagBase * /*tag*/, MeshDocument &/*md*/, MeshModel *mm=0); }; diff --git a/src/meshlabplugins/render_gdp/meshrender.cpp b/src/meshlabplugins/render_gdp/meshrender.cpp index 82885e141..1b0bdda01 100644 --- a/src/meshlabplugins/render_gdp/meshrender.cpp +++ b/src/meshlabplugins/render_gdp/meshrender.cpp @@ -457,7 +457,7 @@ void MeshShaderRenderPlugin::Render(QAction *a, MeshDocument &md, RenderMode &rm glGetError(); foreach(MeshModel * mp, md.meshList) { - if(mp->visible) mp->Render(rm.drawMode,rm.colorMode,rm.textureMode); + if(mp->visible) mp->render(rm.drawMode,rm.colorMode,rm.textureMode); } glUseProgramObjectARB(0); }