mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removing warnings

Browse Source
This commit is contained in:
Alexander Bock
2020-04-14 22:32:26 +02:00
parent f1fe2f197b
commit 5a94c486f0
20 changed files with 93 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/globebrowsing/globebrowsingmodule.cpp
View File

@@ -626,8 +626,7 @@ void GlobeBrowsingModule::goToGeodetic2(const globebrowsing::RenderableGlobe& gl
}
void GlobeBrowsingModule::goToGeodetic3(const globebrowsing::RenderableGlobe& globe,
globebrowsing::Geodetic3 geo3,
bool doResetCameraDirection)
globebrowsing::Geodetic3 geo3, bool)
{
using namespace globebrowsing;
const glm::dvec3 positionModelSpace = globe.ellipsoid().cartesianPosition(geo3);

3
modules/globebrowsing/src/rawtiledatareader.cpp
View File

@@ -394,7 +394,8 @@ PixelRegion highestResPixelRegion(const GeodeticPatch& geodeticPatch,
return region;
}
RawTile::ReadError postProcessErrorCheck(const RawTile& rawTile, size_t nRasters,
RawTile::ReadError postProcessErrorCheck(const RawTile& rawTile,
[[ maybe_unused ]] size_t nRasters,
float noDataValue)
{
// This check was implicit before and just made explicit here

4
modules/globebrowsing/src/shadowcomponent.cpp
View File

@@ -199,8 +199,8 @@ ShadowComponent::ShadowComponent(const ghoul::Dictionary& dictionary)
if (_shadowMapDictionary.hasKey(DepthMapSizeInfo.identifier)) {
glm::vec2 depthMapSize =
_shadowMapDictionary.value<glm::vec2>(DepthMapSizeInfo.identifier);
_shadowDepthTextureWidth = depthMapSize.x;
_shadowDepthTextureHeight = depthMapSize.y;
_shadowDepthTextureWidth = static_cast<int>(depthMapSize.x);
_shadowDepthTextureHeight = static_cast<int>(depthMapSize.y);
_dynamicDepthTextureRes = false;
}
else {

2
modules/globebrowsing/src/timequantizer.cpp
View File

@@ -540,7 +540,7 @@ void TimeQuantizer::doFirstApproximation(DateTime& quantized, DateTime& unQ,
static_cast<double>(_start.year());
minIncrementsAdjust = minYearsToAdjust / value;
quantized.setYear(
_start.year() + static_cast<int>(minIncrementsAdjust) * value
_start.year() + static_cast<int>(minIncrementsAdjust * value)
);
break;
case 'M':