small fixes for PR

This commit is contained in:
Elon Olsson
2020-05-07 14:57:01 -04:00
parent 542ce6d0b5
commit b72e678ff9
16 changed files with 44 additions and 1004 deletions

View File

@@ -684,7 +684,6 @@ void RenderableFieldlinesSequence::setupProperties() {
_pMaskingGroup.addProperty(_pMaskingMin);
_pMaskingGroup.addProperty(_pMaskingMax);
_pMaskingGroup.addProperty(_pMaskingQuantity);
// --------------------- Add Options to OptionProperties --------------------- //
_pColorMethod.addOption(static_cast<int>(ColorMethod::Uniform), "Uniform");
@@ -1139,11 +1138,6 @@ void RenderableFieldlinesSequence::render(const RenderData& data, RendererTasks&
}
glBindVertexArray(_vertexArrayObject);
/* #ifdef __APPLE__
glLineWidth(1.f);
#else
glLineWidth(ceil((2.f * 1.f + _pLineWidth) * std::sqrt(2.f)));
#endif*/
glLineWidth(_pLineWidth);
glMultiDrawArrays(