mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 12:59:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix warning in blockplaneintersectiongeometry

Browse Source
This commit is contained in:
Emil Axelsson
2016-03-22 11:12:00 +01:00
parent a44eed992f
commit 479644496d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/blockplaneintersectiongeometry.cpp
View File

@@ -111,13 +111,13 @@ void BlockPlaneIntersectionGeometry::updateVertices() {
std::vector< std::pair<int, float> > angles(nIntersections-1);
glm::vec3 vector1 = glm::normalize(intersections[1] - intersections[0]);
angles[0] = std::pair<int, float>(1, 0.0);
angles[0] = std::pair<int, float>(1, 0.0f);
for (int i = 2; i < nIntersections; i++) {
glm::vec3 vectorI = glm::normalize(intersections[i] - intersections[0]);
float sinA = glm::dot(glm::cross(vector1, vectorI), _normal);
float cosA = glm::dot(vector1, vectorI);
angles[i-1] = std::pair<int, float>(i, glm::sign(sinA) * (1.0 - cosA));
angles[i - 1] = std::pair<int, float>(i, static_cast<float>(glm::sign(sinA) * (1.0 - cosA)));
}
// Sort the vectors by angle in the plane