Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Windows) Fixed some MSVC compiler warnings.

Browse source
This commit is contained in:
Leon Styhre 2021-10-10 18:28:00 +02:00
parent 261ad3735a
commit 33d3df9db4
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
es-core/src/components/ScrollIndicatorComponent.h
View file

@ -92,8 +92,9 @@ public:
scrollUp->setOpacity( scrollUp->setOpacity(
static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255)); static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255));
}; };
scrollUp->setAnimation(new LambdaAnimation(upFadeInFunc, fadeInTime), 0, scrollUp->setAnimation(
nullptr, false); new LambdaAnimation(upFadeInFunc, static_cast<int>(fadeInTime)), 0, nullptr,
false);
} }
if (upFadeOut) { if (upFadeOut) {
@ -101,8 +102,9 @@ public:
scrollUp->setOpacity( scrollUp->setOpacity(
static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255)); static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255));
}; };
scrollUp->setAnimation(new LambdaAnimation(upFadeOutFunc, fadeInTime), 0, scrollUp->setAnimation(
nullptr, true); new LambdaAnimation(upFadeOutFunc, static_cast<int>(fadeInTime)), 0,
nullptr, true);
} }
if (downFadeIn) { if (downFadeIn) {
@ -110,8 +112,9 @@ public:
scrollDown->setOpacity( scrollDown->setOpacity(
static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255)); static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255));
}; };
scrollDown->setAnimation(new LambdaAnimation(downFadeInFunc, fadeInTime), 0, scrollDown->setAnimation(
nullptr, false); new LambdaAnimation(downFadeInFunc, static_cast<int>(fadeInTime)), 0,
nullptr, false);
} }
if (downFadeOut) { if (downFadeOut) {
@ -119,8 +122,9 @@ public:
scrollDown->setOpacity( scrollDown->setOpacity(
static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255)); static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255));
}; };
scrollDown->setAnimation(new LambdaAnimation(downFadeOutFunc, fadeInTime), 0, scrollDown->setAnimation(
nullptr, true); new LambdaAnimation(downFadeOutFunc, static_cast<int>(fadeInTime)), 0,
nullptr, true);
} }
mPreviousScrollState = state; mPreviousScrollState = state;