lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-16 01:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

more gcc warnings

Browse Source
This commit is contained in:
alemuntoni 2020-03-10 10:21:31 +01:00
parent b27902ead2
commit cf69669b71
3 changed files with 122 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/meshlab/layerDialog.cpp
View File

@ -1226,7 +1226,7 @@ DecoratorParamsTreeWidget::DecoratorParamsTreeWidget(QAction* act,MainWindow *mw
{
MeshDecorateInterface* decPlug = qobject_cast<MeshDecorateInterface *>(act->parent());
if (!decPlug)
mw->GLA()->Logf(GLLogStream::SYSTEM,"MeshLab System Error: A Decorator Plugin has been expected.");
mw->GLA()->Log(GLLogStream::SYSTEM, "MeshLab System Error: A Decorator Plugin has been expected.");
else
{
decPlug->initGlobalParameterSet(act,tmpSet);

223
src/meshlab/ml_rendering_actions.cpp
View File

@ -527,22 +527,24 @@ void MLRenderingNoShadingAction::updateRenderingData(MLRenderingData& rd )
{
switch (_pm)
{
case (MLRenderingData::PR_POINTS):
{
opts._perpoint_noshading = isChecked();
case (MLRenderingData::PR_POINTS):
{
opts._perpoint_noshading = isChecked();
break;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
opts._perwire_noshading = isChecked();
break;
}
case (MLRenderingData::PR_SOLID):
{
opts._persolid_noshading = isChecked();
break;
}
default:
break;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
opts._perwire_noshading = isChecked();
break;
}
case (MLRenderingData::PR_SOLID):
{
opts._persolid_noshading = isChecked();
break;
}
}
rd.set(opts);
}
@ -556,19 +558,21 @@ bool MLRenderingNoShadingAction::isRenderingDataEnabled( const MLRenderingData&
{
switch (_pm)
{
case (MLRenderingData::PR_POINTS):
{
return opts._perpoint_noshading;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
return opts._perwire_noshading;
}
case (MLRenderingData::PR_SOLID):
{
return opts._persolid_noshading;
}
case (MLRenderingData::PR_POINTS):
{
return opts._perpoint_noshading;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
return opts._perwire_noshading;
}
case (MLRenderingData::PR_SOLID):
{
return opts._persolid_noshading;
}
default:
break;
}
}
return false;
@ -639,22 +643,24 @@ void MLRenderingPerMeshColorAction::updateRenderingData(MLRenderingData& rd)
{
switch (_pm)
{
case (MLRenderingData::PR_POINTS):
{
opts._perpoint_mesh_color_enabled = isChecked();
case (MLRenderingData::PR_POINTS):
{
opts._perpoint_mesh_color_enabled = isChecked();
break;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
opts._perwire_mesh_color_enabled = isChecked();
break;
}
case (MLRenderingData::PR_SOLID):
{
opts._persolid_mesh_color_enabled = isChecked();
break;
}
default:
break;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
opts._perwire_mesh_color_enabled = isChecked();
break;
}
case (MLRenderingData::PR_SOLID):
{
opts._persolid_mesh_color_enabled = isChecked();
break;
}
}
rd.set(opts);
}
@ -668,21 +674,23 @@ bool MLRenderingPerMeshColorAction::isRenderingDataEnabled( const MLRenderingDat
{
switch (_pm)
{
case (MLRenderingData::PR_POINTS):
{
return opts._perpoint_mesh_color_enabled;
case (MLRenderingData::PR_POINTS):
{
return opts._perpoint_mesh_color_enabled;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
return opts._perwire_mesh_color_enabled;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
return opts._perwire_mesh_color_enabled;
}
case (MLRenderingData::PR_SOLID):
{
return opts._persolid_mesh_color_enabled;
}
}
case (MLRenderingData::PR_SOLID):
{
return opts._persolid_mesh_color_enabled;
}
default:
break;
}
}
return false;
@ -850,25 +858,27 @@ void MLRenderingUserDefinedColorAction::updateRenderingData( MLRenderingData& rd
{
switch (_pm)
{
case (MLRenderingData::PR_POINTS):
{
opts._perpoint_fixed_color_enabled = isChecked();
opts._perpoint_fixed_color = _coluser;
case (MLRenderingData::PR_POINTS):
{
opts._perpoint_fixed_color_enabled = isChecked();
opts._perpoint_fixed_color = _coluser;
break;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
opts._perwire_fixed_color_enabled = isChecked();
opts._perwire_fixed_color = _coluser;
break;
}
case (MLRenderingData::PR_SOLID):
{
opts._persolid_fixed_color_enabled = isChecked();
opts._persolid_fixed_color = _coluser;
break;
}
default:
break;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
opts._perwire_fixed_color_enabled = isChecked();
opts._perwire_fixed_color = _coluser;
break;
}
case (MLRenderingData::PR_SOLID):
{
opts._persolid_fixed_color_enabled = isChecked();
opts._persolid_fixed_color = _coluser;
break;
}
}
rd.set(opts);
}
@ -882,21 +892,22 @@ bool MLRenderingUserDefinedColorAction::isRenderingDataEnabled( const MLRenderin
{
switch (_pm)
{
case (MLRenderingData::PR_POINTS):
{
return opts._perpoint_fixed_color_enabled;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
return opts._perwire_fixed_color_enabled;
}
case (MLRenderingData::PR_SOLID):
{
return opts._persolid_fixed_color_enabled;
}
case (MLRenderingData::PR_POINTS):
{
return opts._perpoint_fixed_color_enabled;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
return opts._perwire_fixed_color_enabled;
}
case (MLRenderingData::PR_SOLID):
{
return opts._persolid_fixed_color_enabled;
}
default:
break;
}
}
return false;
@ -910,22 +921,24 @@ void MLRenderingUserDefinedColorAction::readColor(const MLRenderingData& rd, vcg
{
switch (_pm)
{
case (MLRenderingData::PR_POINTS):
{
col = opts._perpoint_fixed_color;
break;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
col = opts._perwire_fixed_color;
break;
}
case (MLRenderingData::PR_SOLID):
{
col = opts._persolid_fixed_color;
break;
}
case (MLRenderingData::PR_POINTS):
{
col = opts._perpoint_fixed_color;
break;
}
case (MLRenderingData::PR_WIREFRAME_TRIANGLES):
case (MLRenderingData::PR_WIREFRAME_EDGES):
{
col = opts._perwire_fixed_color;
break;
}
case (MLRenderingData::PR_SOLID):
{
col = opts._persolid_fixed_color;
break;
}
default:
break;
}
}
}

6
src/meshlabplugins/render_gdp/meshrender.cpp
View File

@ -248,7 +248,7 @@ void MeshShaderRenderPlugin::initActionList() {
}
}
void MeshShaderRenderPlugin::Init(QAction *a, MeshDocument &md, MLSceneGLSharedDataContext::PerMeshRenderingDataMap& mp, GLArea *gla)
void MeshShaderRenderPlugin::Init(QAction *a, MeshDocument &/*md*/, MLSceneGLSharedDataContext::PerMeshRenderingDataMap& /*mp*/, GLArea *gla)
{
if (sDialog) {
sDialog->close();
@ -404,7 +404,7 @@ void MeshShaderRenderPlugin::Init(QAction *a, MeshDocument &md, MLSceneGLSharedD
}
void MeshShaderRenderPlugin::Render(QAction *a, MeshDocument &md, MLSceneGLSharedDataContext::PerMeshRenderingDataMap& mp, GLArea *gla)
void MeshShaderRenderPlugin::Render(QAction *a, MeshDocument &md, MLSceneGLSharedDataContext::PerMeshRenderingDataMap& /*mp*/, GLArea *gla)
{
// MeshModel &mm
if (shaders.find(a->text()) != shaders.end()) {
@ -483,7 +483,7 @@ void MeshShaderRenderPlugin::Render(QAction *a, MeshDocument &md, MLSceneGLShare
if ((gla != NULL) && (gla->mvc() != NULL))
{
MLSceneGLSharedDataContext* shared = gla->mvc()->sharedDataContext();
foreach(MeshModel * mp, md.meshList)
for(MeshModel * mp : md.meshList)
{
if ((mp != NULL) && (gla->meshVisibilityMap[mp->id()]))
shared->draw(mp->id(),gla->context());