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

Remove warnings on MSVC

Browse Source
This commit is contained in:
Alexander Bock
2023-04-26 23:51:16 +02:00
parent bba5fe6eaa
commit 6dfd0cd3a8
11 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/globebrowsing/src/geojson/geojsonproperties.cpp
View File

@@ -422,8 +422,12 @@ void GeoJsonProperties::createFromDictionary(const ghoul::Dictionary& dictionary
// Distances are computed based on a certain lat/long angle size
constexpr float DefaultAngle = glm::radians(1.f);
constexpr float MaxAngle = glm::radians(45.f);
float defaultDistance = globe.ellipsoid().longitudalDistance(0.f, 0.f, DefaultAngle);
float maxDistance = globe.ellipsoid().longitudalDistance(0.f, 0.f, MaxAngle);
float defaultDistance = static_cast<float>(
globe.ellipsoid().longitudalDistance(0.f, 0.f, DefaultAngle)
);
float maxDistance = static_cast<float>(
globe.ellipsoid().longitudalDistance(0.f, 0.f, MaxAngle)
);
tessellation.distance = defaultDistance;
tessellation.distance.setMaxValue(maxDistance);

2
modules/globebrowsing/src/geojson/globegeometryfeature.cpp
View File

@@ -575,8 +575,6 @@ std::vector<std::vector<glm::vec3>> GlobeGeometryFeature::createLineGeometry() {
continue;
}
float length = static_cast<float>(glm::distance(lastPos, v));
if (_properties.tessellationEnabled()) {
// Tessellate.
// But first, determine the step size for the tessellation (larger