diff options
author | Georg Zotti <Georg.Zotti@univie.ac.at> | 2022-03-19 21:35:17 +0100 |
---|---|---|
committer | Georg Zotti <Georg.Zotti@univie.ac.at> | 2022-03-19 21:35:17 +0100 |
commit | 8dac1b4fcc6276d528f34a16e57a16c125486825 (patch) | |
tree | 31fa25fbc2efeee9bd83cea88a3864b6a8409818 | |
parent | eef8b4601394bc695ea4f57cf311f47d3b87b655 (diff) |
cleanup casting warnings
-rw-r--r-- | src/core/modules/Atmosphere.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/modules/Atmosphere.cpp b/src/core/modules/Atmosphere.cpp index 22d1a6e2ac..08aeab2b71 100644 --- a/src/core/modules/Atmosphere.cpp +++ b/src/core/modules/Atmosphere.cpp @@ -136,21 +136,21 @@ void Atmosphere::computeColor(StelCore* core, const double JD, const Planet& cur delete[] colorGrid; delete [] posGrid; skyResolutionY = StelApp::getInstance().getSettings()->value("landscape/atmosphereybin", 44).toUInt(); - skyResolutionX = static_cast<unsigned int>(floorf(0.5f+skyResolutionY*(0.5f*sqrtf(3.0f))*prj->getViewportWidth()/prj->getViewportHeight())); + skyResolutionX = static_cast<unsigned int>(floorf(0.5f+static_cast<float>(skyResolutionY)*(0.5f*sqrtf(3.0f))*static_cast<float>(prj->getViewportWidth())/static_cast<float>(prj->getViewportHeight()))); posGrid = new Vec2f[static_cast<size_t>((1+skyResolutionX)*(1+skyResolutionY))]; colorGrid = new Vec4f[static_cast<size_t>((1+skyResolutionX)*(1+skyResolutionY))]; - float stepX = static_cast<float>(prj->getViewportWidth()) / static_cast<float>(skyResolutionX-0.5f); - float stepY = static_cast<float>(prj->getViewportHeight()) / skyResolutionY; - float viewport_left = prj->getViewportPosX(); - float viewport_bottom = prj->getViewportPosY(); + float stepX = static_cast<float>(prj->getViewportWidth()) / (static_cast<float>(skyResolutionX)-0.5f); + float stepY = static_cast<float>(prj->getViewportHeight()) / static_cast<float>(skyResolutionY); + float viewport_left = static_cast<float>(prj->getViewportPosX()); + float viewport_bottom = static_cast<float>(prj->getViewportPosY()); for (unsigned int x=0; x<=skyResolutionX; ++x) { for(unsigned int y=0; y<=skyResolutionY; ++y) { Vec2f &v(posGrid[y*(1+skyResolutionX)+x]); v[0] = viewport_left + ((x == 0) ? 0.f : - (x == skyResolutionX) ? prj->getViewportWidth() : (x-0.5f*(y&1))*stepX); - v[1] = viewport_bottom+y*stepY; + (x == skyResolutionX) ? static_cast<float>(prj->getViewportWidth()) : (static_cast<float>(x)-0.5f*(y&1))*stepX); + v[1] = viewport_bottom+static_cast<float>(y)*stepY; } } posGridBuffer.destroy(); @@ -355,7 +355,7 @@ void Atmosphere::computeColor(StelCore* core, const double JD, const Planet& cur // Update average luminance if (!overrideAverageLuminance) - averageLuminance = sum_lum/((1+skyResolutionX)*(1+skyResolutionY)); + averageLuminance = sum_lum/static_cast<float>((1+skyResolutionX)*(1+skyResolutionY)); } // override computable luminance. This is for special operations only, e.g. for scripting of brightness-balanced image export. |