Mercurial > hg > orthanc-stone
diff Framework/Scene2D/Internals/OpenGLLinesProgram.cpp @ 698:8b6adfb62a2f refactor-viewport-controller
Code is broken -- stashing ongoing work in a branch
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Wed, 15 May 2019 16:56:17 +0200 |
| parents | e3f21a265be5 |
| children | 5c551f078c18 |
line wrap: on
line diff
--- a/Framework/Scene2D/Internals/OpenGLLinesProgram.cpp Tue May 14 19:38:51 2019 +0200 +++ b/Framework/Scene2D/Internals/OpenGLLinesProgram.cpp Wed May 15 16:56:17 2019 +0200 @@ -205,40 +205,40 @@ } // First triangle - coords.push_back(x1_); - coords.push_back(y1_); - coords.push_back(1); - coords.push_back(x2_); - coords.push_back(y2_); - coords.push_back(-1); - coords.push_back(x2_); - coords.push_back(y2_); - coords.push_back(1); + coords.push_back(static_cast<float>(x1_)); + coords.push_back(static_cast<float>(y1_)); + coords.push_back(static_cast<float>(1)); + coords.push_back(static_cast<float>(x2_)); + coords.push_back(static_cast<float>(y2_)); + coords.push_back(static_cast<float>(-1)); + coords.push_back(static_cast<float>(x2_)); + coords.push_back(static_cast<float>(y2_)); + coords.push_back(static_cast<float>(1)); - miterDirections.push_back(miterX1_); - miterDirections.push_back(miterY1_); - miterDirections.push_back(miterX2_); - miterDirections.push_back(miterY2_); - miterDirections.push_back(miterX2_); - miterDirections.push_back(miterY2_); + miterDirections.push_back(static_cast<float>(miterX1_)); + miterDirections.push_back(static_cast<float>(miterY1_)); + miterDirections.push_back(static_cast<float>(miterX2_)); + miterDirections.push_back(static_cast<float>(miterY2_)); + miterDirections.push_back(static_cast<float>(miterX2_)); + miterDirections.push_back(static_cast<float>(miterY2_)); // Second triangle - coords.push_back(x1_); - coords.push_back(y1_); - coords.push_back(1); - coords.push_back(x1_); - coords.push_back(y1_); - coords.push_back(-1); - coords.push_back(x2_); - coords.push_back(y2_); - coords.push_back(-1); + coords.push_back(static_cast<float>(x1_)); + coords.push_back(static_cast<float>(y1_)); + coords.push_back(static_cast<float>(1)); + coords.push_back(static_cast<float>(x1_)); + coords.push_back(static_cast<float>(y1_)); + coords.push_back(static_cast<float>(-1)); + coords.push_back(static_cast<float>(x2_)); + coords.push_back(static_cast<float>(y2_)); + coords.push_back(static_cast<float>(-1)); - miterDirections.push_back(miterX1_); - miterDirections.push_back(miterY1_); - miterDirections.push_back(miterX1_); - miterDirections.push_back(miterY1_); - miterDirections.push_back(miterX2_); - miterDirections.push_back(miterY2_); + miterDirections.push_back(static_cast<float>(miterX1_)); + miterDirections.push_back(static_cast<float>(miterY1_)); + miterDirections.push_back(static_cast<float>(miterX1_)); + miterDirections.push_back(static_cast<float>(miterY1_)); + miterDirections.push_back(static_cast<float>(miterX2_)); + miterDirections.push_back(static_cast<float>(miterY2_)); } }; @@ -247,7 +247,7 @@ const PolylineSceneLayer& layer) : context_(context), verticesCount_(0), - thickness_(layer.GetThickness()), + thickness_(static_cast<float>(layer.GetThickness())), red_(layer.GetRedAsFloat()), green_(layer.GetGreenAsFloat()), blue_(layer.GetBlueAsFloat()) @@ -418,12 +418,15 @@ double t1 = std::max(thickness, aliasingBorder); double t0 = std::max(0.0, thickness - aliasingBorder); - glUniform1f(program_->GetUniformLocation("u_thickness"), t1 / zoom); - glUniform1f(program_->GetUniformLocation("u_antialiasing_start"), t0 / t1); + glUniform1f(program_->GetUniformLocation("u_thickness"), + static_cast<GLfloat>(t1 / zoom)); + glUniform1f(program_->GetUniformLocation("u_antialiasing_start"), + static_cast<GLfloat>(t0 / t1)); } else { - glUniform1f(program_->GetUniformLocation("u_thickness"), thickness / zoom); + glUniform1f(program_->GetUniformLocation("u_thickness"), + static_cast<GLfloat>(thickness / zoom)); } } else @@ -433,12 +436,15 @@ double t1 = std::max(thickness, aliasingBorder / zoom); double t0 = std::max(0.0, thickness - aliasingBorder / zoom); - glUniform1f(program_->GetUniformLocation("u_thickness"), t1); - glUniform1f(program_->GetUniformLocation("u_antialiasing_start"), t0 / t1); + glUniform1f(program_->GetUniformLocation("u_thickness"), + static_cast<GLfloat>(t1)); + glUniform1f(program_->GetUniformLocation("u_antialiasing_start"), + static_cast<GLfloat>(t0 / t1)); } else { - glUniform1f(program_->GetUniformLocation("u_thickness"), thickness); + glUniform1f(program_->GetUniformLocation("u_thickness"), + static_cast<GLfloat>(thickness)); } } @@ -446,12 +452,14 @@ { glEnable(GL_BLEND); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - glDrawArrays(GL_TRIANGLES, 0, data.GetVerticesCount()); + glDrawArrays(GL_TRIANGLES, 0, + static_cast<GLsizei>(data.GetVerticesCount())); glDisable(GL_BLEND); } else { - glDrawArrays(GL_TRIANGLES, 0, data.GetVerticesCount()); + glDrawArrays(GL_TRIANGLES, 0, + static_cast<GLsizei>(data.GetVerticesCount())); } glDisableVertexAttribArray(locationPosition);