Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 09:35:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix build warnings (mostly adding explicit type casting)

Browse source
This commit is contained in:
D. Polders 2017-10-18 16:19:32 +02:00
parent 3c60235363
commit fd40e84ba5
20 changed files with 45 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-app/src/FileFilterIndex.cpp
View file

@ -131,7 +131,7 @@ std::string FileFilterIndex::getIndexableKey(FileData* game, FilterIndexType typ
} }
catch (int e) catch (int e)
{ {
LOG(LogError) << "Error parsing Rating (invalid value, expected decimal): " << ratingString; LOG(LogError) << "Error parsing Rating (invalid value, exception nr.): " << ratingString << ", " << e;
} }
} }
} }

2
es-app/src/MetaData.cpp
View file

@ -151,7 +151,7 @@ bool MetaDataList::isDefault()
{ {
const std::vector<MetaDataDecl>& mdd = getMDD(); const std::vector<MetaDataDecl>& mdd = getMDD();
for (int i = 1; i < mMap.size(); i++) { for (unsigned int i = 1; i < mMap.size(); i++) {
if (mMap.at(mdd[i].key) != mdd[i].defaultValue) return false; if (mMap.at(mdd[i].key) != mdd[i].defaultValue) return false;
} }

7
es-app/src/SystemData.cpp
View file

@ -405,7 +405,7 @@ SystemData* SystemData::getRandomSystem()
} }
// get random number in range // get random number in range
int target = std::round(((double)std::rand() / (double)RAND_MAX) * (total - 1)); int target = (int) std::round(((double)std::rand() / (double)RAND_MAX) * (total - 1));
for (auto it = sSystemVector.begin(); it != sSystemVector.end(); it++) for (auto it = sSystemVector.begin(); it != sSystemVector.end(); it++)
{ {
if ((*it)->isGameSystem()) if ((*it)->isGameSystem())
@ -420,6 +420,9 @@ SystemData* SystemData::getRandomSystem()
} }
} }
} }
// if we end up here, there is no valid system
return NULL;
} }
FileData* SystemData::getRandomGame() FileData* SystemData::getRandomGame()
@ -430,7 +433,7 @@ FileData* SystemData::getRandomGame()
// get random number in range // get random number in range
if (total == 0) if (total == 0)
return NULL; return NULL;
target = std::round(((double)std::rand() / (double)RAND_MAX) * (total - 1)); target = (int) std::round(((double)std::rand() / (double)RAND_MAX) * (total - 1));
return list.at(target); return list.at(target);
} }

6
es-app/src/SystemScreenSaver.cpp
View file

@ -99,7 +99,7 @@ void SystemScreenSaver::startScreenSaver()
#endif #endif
mVideoScreensaver->setOrigin(0.5f, 0.5f); mVideoScreensaver->setOrigin(0.5f, 0.5f);
mVideoScreensaver->setPosition(Renderer::getScreenWidth()/2, Renderer::getScreenHeight()/2); mVideoScreensaver->setPosition(Renderer::getScreenWidth() / 2.0f, Renderer::getScreenHeight() / 2.0f);
if (Settings::getInstance()->getBool("StretchVideoOnScreenSaver")) if (Settings::getInstance()->getBool("StretchVideoOnScreenSaver"))
{ {
@ -148,7 +148,7 @@ void SystemScreenSaver::startScreenSaver()
mImageScreensaver->setImage(path); mImageScreensaver->setImage(path);
mImageScreensaver->setOrigin(0.5f, 0.5f); mImageScreensaver->setOrigin(0.5f, 0.5f);
mImageScreensaver->setPosition(Renderer::getScreenWidth()/2, Renderer::getScreenHeight()/2); mImageScreensaver->setPosition(Renderer::getScreenWidth() / 2.0f, Renderer::getScreenHeight() / 2.0f);
if (Settings::getInstance()->getBool("SlideshowScreenSaverStretch")) if (Settings::getInstance()->getBool("SlideshowScreenSaverStretch"))
{ {
@ -230,7 +230,7 @@ void SystemScreenSaver::renderScreenSaver()
{ {
if (mImageScreensaver->hasImage()) if (mImageScreensaver->hasImage())
{ {
mImageScreensaver->setOpacity(255-mOpacity); mImageScreensaver->setOpacity(255- (unsigned char) (mOpacity * 255));
Eigen::Affine3f transform = Eigen::Affine3f::Identity(); Eigen::Affine3f transform = Eigen::Affine3f::Identity();
mImageScreensaver->render(transform); mImageScreensaver->render(transform);

4
es-app/src/guis/GuiInfoPopup.cpp
View file

@ -32,8 +32,8 @@ GuiInfoPopup::GuiInfoPopup(Window* window, std::string message, int duration) :
} }
// add a padding to the box // add a padding to the box
int paddingX = Renderer::getScreenWidth() * 0.03f; int paddingX = (int) (Renderer::getScreenWidth() * 0.03f);
int paddingY = Renderer::getScreenHeight() * 0.02f; int paddingY = (int) (Renderer::getScreenHeight() * 0.02f);
mSize[0] = mSize.x() + paddingX; mSize[0] = mSize.x() + paddingX;
mSize[1] = mSize.y() + paddingY; mSize[1] = mSize.y() + paddingY;

4
es-app/src/guis/GuiMetaDataEd.cpp
View file

@ -152,8 +152,8 @@ GuiMetaDataEd::GuiMetaDataEd(Window* window, MetaDataList* md, const std::vector
mButtons = makeButtonGrid(mWindow, buttons); mButtons = makeButtonGrid(mWindow, buttons);
mGrid.setEntry(mButtons, Vector2i(0, 2), true, false); mGrid.setEntry(mButtons, Vector2i(0, 2), true, false);
// resize + center // resize + center
float width = std::min(Renderer::getScreenHeight(), (unsigned int) (Renderer::getScreenWidth() * 0.90f)); float width = (float) std::min(Renderer::getScreenHeight(), (unsigned int) (Renderer::getScreenWidth() * 0.90f));
setSize(width, Renderer::getScreenHeight() * 0.82f); setSize(width, Renderer::getScreenHeight() * 0.82f);
setPosition((Renderer::getScreenWidth() - mSize.x()) / 2, (Renderer::getScreenHeight() - mSize.y()) / 2); setPosition((Renderer::getScreenWidth() - mSize.x()) / 2, (Renderer::getScreenHeight() - mSize.y()) / 2);
} }

2
es-app/src/main.cpp
View file

@ -314,7 +314,7 @@ int main(int argc, char* argv[])
while(running) while(running)
{ {
SDL_Event event; SDL_Event event;
bool ps_standby = PowerSaver::getState() && SDL_GetTicks() - ps_time > PowerSaver::getMode(); bool ps_standby = PowerSaver::getState() && (int) SDL_GetTicks() - ps_time > PowerSaver::getMode();
if(ps_standby ? SDL_WaitEventTimeout(&event, PowerSaver::getTimeout()) : SDL_PollEvent(&event)) if(ps_standby ? SDL_WaitEventTimeout(&event, PowerSaver::getTimeout()) : SDL_PollEvent(&event))
{ {

29
es-app/src/views/SystemView.cpp
View file

@ -172,7 +172,6 @@ bool SystemView::input(InputConfig* config, Input input)
// get random system // get random system
// go to system // go to system
setCursor(SystemData::getRandomSystem()); setCursor(SystemData::getRandomSystem());
//ViewController::get()->goToRandomGame();
return true; return true;
} }
}else{ }else{
@ -430,36 +429,36 @@ void SystemView::renderCarousel(const Eigen::Affine3f& trans)
switch (mCarousel.type) switch (mCarousel.type)
{ {
case VERTICAL_WHEEL: case VERTICAL_WHEEL:
yOff = (mCarousel.size.y() - mCarousel.logoSize.y()) / 2 - (mCamOffset * logoSpacing[1]); yOff = (mCarousel.size.y() - mCarousel.logoSize.y()) / 2.f - (mCamOffset * logoSpacing[1]);
if (mCarousel.logoAlignment == ALIGN_LEFT) if (mCarousel.logoAlignment == ALIGN_LEFT)
xOff = mCarousel.logoSize.x() / 10; xOff = mCarousel.logoSize.x() / 10.f;
else if (mCarousel.logoAlignment == ALIGN_RIGHT) else if (mCarousel.logoAlignment == ALIGN_RIGHT)
xOff = mCarousel.size.x() - (mCarousel.logoSize.x() * 1.1); xOff = mCarousel.size.x() - (mCarousel.logoSize.x() * 1.1f);
else else
xOff = (mCarousel.size.x() - mCarousel.logoSize.x()) / 2; xOff = (mCarousel.size.x() - mCarousel.logoSize.x()) / 2.f;
break; break;
case VERTICAL: case VERTICAL:
logoSpacing[1] = ((mCarousel.size.y() - (mCarousel.logoSize.y() * mCarousel.maxLogoCount)) / (mCarousel.maxLogoCount)) + mCarousel.logoSize.y(); logoSpacing[1] = ((mCarousel.size.y() - (mCarousel.logoSize.y() * mCarousel.maxLogoCount)) / (mCarousel.maxLogoCount)) + mCarousel.logoSize.y();
yOff = (mCarousel.size.y() - mCarousel.logoSize.y()) / 2 - (mCamOffset * logoSpacing[1]); yOff = (mCarousel.size.y() - mCarousel.logoSize.y()) / 2.f - (mCamOffset * logoSpacing[1]);
if (mCarousel.logoAlignment == ALIGN_LEFT) if (mCarousel.logoAlignment == ALIGN_LEFT)
xOff = mCarousel.logoSize.x() / 10; xOff = mCarousel.logoSize.x() / 10.f;
else if (mCarousel.logoAlignment == ALIGN_RIGHT) else if (mCarousel.logoAlignment == ALIGN_RIGHT)
xOff = mCarousel.size.x() - (mCarousel.logoSize.x() * 1.1); xOff = mCarousel.size.x() - (mCarousel.logoSize.x() * 1.1f);
else else
xOff = (mCarousel.size.x() - mCarousel.logoSize.x()) / 2; xOff = (mCarousel.size.x() - mCarousel.logoSize.x()) / 2;
break; break;
case HORIZONTAL: case HORIZONTAL:
default: default:
logoSpacing[0] = ((mCarousel.size.x() - (mCarousel.logoSize.x() * mCarousel.maxLogoCount)) / (mCarousel.maxLogoCount)) + mCarousel.logoSize.x(); logoSpacing[0] = ((mCarousel.size.x() - (mCarousel.logoSize.x() * mCarousel.maxLogoCount)) / (mCarousel.maxLogoCount)) + mCarousel.logoSize.x();
xOff = (mCarousel.size.x() - mCarousel.logoSize.x()) / 2 - (mCamOffset * logoSpacing[0]); xOff = (mCarousel.size.x() - mCarousel.logoSize.x()) / 2.f - (mCamOffset * logoSpacing[0]);
if (mCarousel.logoAlignment == ALIGN_TOP) if (mCarousel.logoAlignment == ALIGN_TOP)
yOff = mCarousel.logoSize.y() / 10; yOff = mCarousel.logoSize.y() / 10.f;
else if (mCarousel.logoAlignment == ALIGN_BOTTOM) else if (mCarousel.logoAlignment == ALIGN_BOTTOM)
yOff = mCarousel.size.y() - (mCarousel.logoSize.y() * 1.1); yOff = mCarousel.size.y() - (mCarousel.logoSize.y() * 1.1f);
else else
yOff = (mCarousel.size.y() - mCarousel.logoSize.y()) / 2; yOff = (mCarousel.size.y() - mCarousel.logoSize.y()) / 2.f;
break; break;
} }
@ -489,11 +488,11 @@ void SystemView::renderCarousel(const Eigen::Affine3f& trans)
float distance = i - mCamOffset; float distance = i - mCamOffset;
float scale = 1.0 + ((mCarousel.logoScale - 1.0) * (1 - fabs(distance))); float scale = 1.0f + ((mCarousel.logoScale - 1.0f) * (1.0f - fabs(distance)));
scale = std::min(mCarousel.logoScale, std::max(1.0f, scale)); scale = std::min(mCarousel.logoScale, std::max(1.0f, scale));
scale /= mCarousel.logoScale; scale /= mCarousel.logoScale;
int opacity = round(0x80 + ((0xFF - 0x80) * (1 - fabs(distance)))); int opacity = (int) round(0x80 + ((0xFF - 0x80) * (1.0f - fabs(distance))));
opacity = std::max((int) 0x80, opacity); opacity = std::max((int) 0x80, opacity);
const std::shared_ptr<GuiComponent> &comp = mEntries.at(index).data.logo; const std::shared_ptr<GuiComponent> &comp = mEntries.at(index).data.logo;
@ -623,7 +622,7 @@ void SystemView::getCarouselFromTheme(const ThemeData::ThemeElement* elem)
if (elem->has("logoSize")) if (elem->has("logoSize"))
mCarousel.logoSize = elem->get<Eigen::Vector2f>("logoSize").cwiseProduct(mSize); mCarousel.logoSize = elem->get<Eigen::Vector2f>("logoSize").cwiseProduct(mSize);
if (elem->has("maxLogoCount")) if (elem->has("maxLogoCount"))
mCarousel.maxLogoCount = std::round(elem->get<float>("maxLogoCount")); mCarousel.maxLogoCount = (int) std::round(elem->get<float>("maxLogoCount"));
if (elem->has("zIndex")) if (elem->has("zIndex"))
mCarousel.zIndex = elem->get<float>("zIndex"); mCarousel.zIndex = elem->get<float>("zIndex");
if (elem->has("logoRotation")) if (elem->has("logoRotation"))

31
es-app/src/views/ViewController.cpp
View file

@ -119,37 +119,6 @@ void ViewController::goToGameList(SystemData* system)
playViewTransition(); playViewTransition();
} }
void ViewController::goToRandomGame()
{
unsigned int total = 0;
for(auto it = SystemData::sSystemVector.begin(); it != SystemData::sSystemVector.end(); it++)
{
if ((*it)->isGameSystem())
total += (*it)->getDisplayedGameCount();
}
// get random number in range
int target = std::round(((double)std::rand() / (double)RAND_MAX) * total);
for (auto it = SystemData::sSystemVector.begin(); it != SystemData::sSystemVector.end(); it++)
{
if ((*it)->isGameSystem())
{
if ((target - (int)(*it)->getDisplayedGameCount()) >= 0)
{
target -= (int)(*it)->getDisplayedGameCount();
}
else
{
goToGameList(*it);
std::vector<FileData*> list = (*it)->getRootFolder()->getFilesRecursive(GAME, true);
getGameListView(*it)->setCursor(list.at(target));
return;
}
}
}
}
void ViewController::playViewTransition() void ViewController::playViewTransition()
{ {
Eigen::Vector3f target(Eigen::Vector3f::Identity()); Eigen::Vector3f target(Eigen::Vector3f::Identity());

1
es-app/src/views/ViewController.h
View file

@ -36,7 +36,6 @@ public:
void goToGameList(SystemData* system); void goToGameList(SystemData* system);
void goToSystemView(SystemData* system); void goToSystemView(SystemData* system);
void goToStart(); void goToStart();
void goToRandomGame();
void onFileChanged(FileData* file, FileChangeType change); void onFileChanged(FileData* file, FileChangeType change);

2
es-app/src/views/gamelist/BasicGameListView.cpp
View file

@ -111,7 +111,7 @@ void BasicGameListView::remove(FileData *game, bool deleteFile)
{ {
std::vector<FileData*> siblings = parent->getChildrenListToDisplay(); std::vector<FileData*> siblings = parent->getChildrenListToDisplay();
auto gameIter = std::find(siblings.begin(), siblings.end(), game); auto gameIter = std::find(siblings.begin(), siblings.end(), game);
auto gamePos = std::distance(siblings.begin(), gameIter); unsigned int gamePos = std::distance(siblings.begin(), gameIter);
if (gameIter != siblings.end()) if (gameIter != siblings.end())
{ {
if ((gamePos + 1) < siblings.size()) if ((gamePos + 1) < siblings.size())

4
es-app/src/views/gamelist/VideoGameListView.cpp
View file

@ -320,8 +320,8 @@ void VideoGameListView::updateInfoPanel()
void VideoGameListView::launch(FileData* game) void VideoGameListView::launch(FileData* game)
{ {
float screenWidth = Renderer::getScreenWidth(); float screenWidth = (float) Renderer::getScreenWidth();
float screenHeight = Renderer::getScreenHeight(); float screenHeight = (float) Renderer::getScreenHeight();
Eigen::Vector3f target(screenWidth / 2.0f, screenHeight / 2.0f, 0); Eigen::Vector3f target(screenWidth / 2.0f, screenHeight / 2.0f, 0);

2
es-core/src/GuiComponent.cpp
View file

@ -200,7 +200,7 @@ void GuiComponent::clearChildren()
void GuiComponent::sortChildren() void GuiComponent::sortChildren()
{ {
std:stable_sort(mChildren.begin(), mChildren.end(), [](GuiComponent* a, GuiComponent* b) { std::stable_sort(mChildren.begin(), mChildren.end(), [](GuiComponent* a, GuiComponent* b) {
return b->getZIndex() > a->getZIndex(); return b->getZIndex() > a->getZIndex();
}); });
} }

2
es-core/src/GuiComponent.h
View file

@ -60,7 +60,7 @@ public:
float getRotation() const; float getRotation() const;
void setRotation(float rotation); void setRotation(float rotation);
inline void setRotationDegrees(float rotation) { setRotation(rotation * M_PI / 180); } inline void setRotationDegrees(float rotation) { setRotation((float) (rotation * M_PI / 180)); }
float getScale() const; float getScale() const;
void setScale(float scale); void setScale(float scale);

2
es-core/src/components/ImageComponent.cpp
View file

@ -17,7 +17,7 @@ Eigen::Vector2i ImageComponent::getTextureSize() const
ImageComponent::ImageComponent(Window* window, bool forceLoad, bool dynamic) : GuiComponent(window), ImageComponent::ImageComponent(Window* window, bool forceLoad, bool dynamic) : GuiComponent(window),
mTargetIsMax(false), mFlipX(false), mFlipY(false), mTargetSize(0, 0), mColorShift(0xFFFFFFFF), mTargetIsMax(false), mFlipX(false), mFlipY(false), mTargetSize(0, 0), mColorShift(0xFFFFFFFF),
mForceLoad(forceLoad), mDynamic(dynamic), mFadeOpacity(0.0f), mFading(false) mForceLoad(forceLoad), mDynamic(dynamic), mFadeOpacity(0), mFading(false)
{ {
updateColors(); updateColors();
} }

2
es-core/src/components/MenuComponent.cpp
View file

@ -63,7 +63,7 @@ void MenuComponent::updateSize()
} }
} }
float width = std::min(Renderer::getScreenHeight(), (unsigned int) (Renderer::getScreenWidth() * 0.90f)); float width = (float) std::min(Renderer::getScreenHeight(), (unsigned int) (Renderer::getScreenWidth() * 0.90f));
setSize(width, height); setSize(width, height);
} }

2
es-core/src/components/TextEditComponent.h
View file

@ -49,7 +49,7 @@ private:
std::string mText; std::string mText;
bool mFocused; bool mFocused;
bool mEditing; bool mEditing;
int mCursor; // cursor position in characters unsigned int mCursor; // cursor position in characters
int mCursorRepeatTimer; int mCursorRepeatTimer;
int mCursorRepeatDir; int mCursorRepeatDir;

2
es-core/src/components/VideoComponent.cpp
View file

@ -155,8 +155,6 @@ void VideoComponent::setOpacity(unsigned char opacity)
void VideoComponent::render(const Eigen::Affine3f& parentTrans) void VideoComponent::render(const Eigen::Affine3f& parentTrans)
{ {
float x, y;
Eigen::Affine3f trans = parentTrans * getTransform(); Eigen::Affine3f trans = parentTrans * getTransform();
GuiComponent::renderChildren(trans); GuiComponent::renderChildren(trans);

12
es-core/src/components/VideoVlcComponent.cpp
View file

@ -319,14 +319,14 @@ void VideoVlcComponent::startVideo()
if(resizeScale.x() < resizeScale.y()) if(resizeScale.x() < resizeScale.y())
{ {
mVideoWidth *= resizeScale.x(); mVideoWidth = (unsigned int) (mVideoWidth * resizeScale.x());
mVideoHeight *= resizeScale.x(); mVideoHeight = (unsigned int) (mVideoHeight * resizeScale.x());
}else{ }else{
mVideoWidth *= resizeScale.y(); mVideoWidth = (unsigned int) (mVideoWidth * resizeScale.y());
mVideoHeight *= resizeScale.y(); mVideoHeight = (unsigned int) (mVideoHeight * resizeScale.y());
} }
mVideoHeight = round(mVideoHeight); mVideoHeight = (unsigned int) round(mVideoHeight);
mVideoWidth = round(mVideoWidth); mVideoWidth = (unsigned int) round(mVideoWidth);
} }
} }
#endif #endif

4
es-core/src/resources/TextureData.cpp
View file

@ -105,8 +105,8 @@ bool TextureData::initImageFromMemory(const unsigned char* fileData, size_t leng
return false; return false;
} }
mSourceWidth = width; mSourceWidth = (float) width;
mSourceHeight = height; mSourceHeight = (float) height;
mScalable = false; mScalable = false;
return initFromRGBA(imageRGBA.data(), width, height); return initFromRGBA(imageRGBA.data(), width, height);