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

- removed global ignore for lib and exe and moved them in the visual studio specific folders

Browse Source
This commit is contained in:
Guido Ranzuglia 2016-11-08 13:12:33 +01:00
parent 6089f0538a
commit f6889ca073
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -14,15 +14,16 @@ build-*/
*.filters
*.db
*.opendb
*.lib
*.exe
moc_*.cpp
ui_*.h
qrc_*.cpp
Debug/
Release/
src/external/lib/win32-msvc2013/*.lib
src/external/lib/win32-msvc2015/*.lib
src/distrib/plugins/*.lib
src/distrib/plugins/*.dll
src/distrib/plugins/*.xml
src/distrib/common.lib
src/distrib/meshlab.exe
src/distrib/meshlabserver.exe

5
src/common/ml_shared_data_context.cpp
View File

@ -609,7 +609,7 @@ void MLPoliciesStandAloneFunctions::updatedRendAttsAccordingToPriorities(const M
result = tmp;
}
void MLPoliciesStandAloneFunctions::suggestedDefaultPerViewRenderingData(MeshModel* meshmodel,MLRenderingData& dtout)
void MLPoliciesStandAloneFunctions::suggestedDefaultPerViewRenderingData(MeshModel* meshmodel,MLRenderingData& dtout, size_t minpolnumpersmoothshading)
{
MLRenderingData dt;
if (meshmodel == NULL)
@ -633,7 +633,8 @@ void MLPoliciesStandAloneFunctions::suggestedDefaultPerViewRenderingData(MeshMod
dt.set(MLRenderingData::PR_POINTS,false);
tmpatts.reset();
tmpatts[MLRenderingData::ATT_NAMES::ATT_VERTPOSITION] = true;
tmpatts[MLRenderingData::ATT_NAMES::ATT_VERTNORMAL] = true;
tmpatts[MLRenderingData::ATT_NAMES::ATT_VERTNORMAL] = (meshmodel->cm.FN() > minpolnumpersmoothshading);
tmpatts[MLRenderingData::ATT_NAMES::ATT_FACENORMAL] = !(tmpatts[MLRenderingData::ATT_NAMES::ATT_VERTNORMAL]);
tmpatts[MLRenderingData::ATT_NAMES::ATT_VERTCOLOR] = true;
if (meshmodel != NULL)
tmpatts[MLRenderingData::ATT_NAMES::ATT_FACECOLOR] = (meshmodel->hasDataMask(MeshModel::MM_FACECOLOR) && !meshmodel->hasDataMask(MeshModel::MM_VERTCOLOR));

2
src/common/ml_shared_data_context.h
View File

@ -224,7 +224,7 @@ struct MLPoliciesStandAloneFunctions
static void suggestedDefaultPerViewGLOptions(MLPerViewGLOptions& tmp);
static void suggestedDefaultPerViewRenderingData(MeshModel* meshmodel, MLRenderingData& dt);
static void suggestedDefaultPerViewRenderingData(MeshModel* meshmodel, MLRenderingData& dt,size_t minpolnumpersmoothshading = 0);
static void disableRedundatRenderingDataAccordingToPriorities(MLRenderingData& dt);

3
src/meshlab/mainwindow.h
View File

@ -81,6 +81,9 @@ public:
size_t perbatchprimitives;
inline static QString perBatchPrimitives() {return "MeshLab::System::perBatchPrimitives";}
size_t minpolygonpersmoothrendering;
inline static QString minPolygonNumberPerSmoothRendering() { return "MeshLab::System::minPolygonNumberPerSmoothRendering"; }
std::ptrdiff_t maxTextureMemory;
inline static QString maxTextureMemoryParam() {return "MeshLab::System::maxTextureMemory";}
};