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

Merge pull request #353 from jrassa/horizontal-wheel

Browse source 
Horizontal wheel support for system view carousel
This commit is contained in:
Jools Wills 2018-01-23 14:49:20 +00:00 committed by GitHub
parent 96a0fa3a14 e9403b6b00
commit da419354cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 57 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,6 +55,7 @@ void SystemView::populate()
ImageComponent* logo = new ImageComponent(mWindow, false, false);
logo->setMaxSize(mCarousel.logoSize * mCarousel.logoScale);
logo->applyTheme(theme, "system", "logo", ThemeFlags::PATH | ThemeFlags::COLOR);
logo->setRotateByTargetSize(true);
e.data.logo = std::shared_ptr<GuiComponent>(logo);
}
}
@ -71,9 +72,13 @@ void SystemView::populate()
e.data.logo = std::shared_ptr<GuiComponent>(text);
if (mCarousel.type == VERTICAL || mCarousel.type == VERTICAL_WHEEL)
{
text->setHorizontalAlignment(mCarousel.logoAlignment);
else
text->setVerticalAlignment(ALIGN_CENTER);
} else {
text->setHorizontalAlignment(ALIGN_CENTER);
text->setVerticalAlignment(mCarousel.logoAlignment);
}
}
if (mCarousel.type == VERTICAL || mCarousel.type == VERTICAL_WHEEL)
@ -157,6 +162,7 @@ bool SystemView::input(InputConfig* config, Input input)
}
break;
case HORIZONTAL:
case HORIZONTAL_WHEEL:
default:
if (config->isMappedTo("left", input))
{
@ -369,7 +375,7 @@ void SystemView::render(const Transform4x4f& parentTrans)
std::vector<HelpPrompt> SystemView::getHelpPrompts()
{
std::vector<HelpPrompt> prompts;
if (mCarousel.type == VERTICAL)
if (mCarousel.type == VERTICAL || mCarousel.type == VERTICAL_WHEEL)
prompts.push_back(HelpPrompt("up/down", "choose"));
else
prompts.push_back(HelpPrompt("left/right", "choose"));
@ -458,6 +464,15 @@ void SystemView::renderCarousel(const Transform4x4f& trans)
else
xOff = (mCarousel.size.x() - mCarousel.logoSize.x()) / 2;
break;
case HORIZONTAL_WHEEL:
xOff = (mCarousel.size.x() - mCarousel.logoSize.x()) / 2 - (mCamOffset * logoSpacing[1]);
if (mCarousel.logoAlignment == ALIGN_TOP)
yOff = mCarousel.logoSize.y() / 10;
else if (mCarousel.logoAlignment == ALIGN_BOTTOM)
yOff = mCarousel.size.y() - (mCarousel.logoSize.y() * 1.1f);
else
yOff = (mCarousel.size.y() - mCarousel.logoSize.y()) / 2;
break;
case HORIZONTAL:
default:
logoSpacing[0] = ((mCarousel.size.x() - (mCarousel.logoSize.x() * mCarousel.maxLogoCount)) / (mCarousel.maxLogoCount)) + mCarousel.logoSize.x();
@ -506,7 +521,7 @@ void SystemView::renderCarousel(const Transform4x4f& trans)
opacity = Math::max((int) 0x80, opacity);
const std::shared_ptr<GuiComponent> &comp = mEntries.at(index).data.logo;
if (mCarousel.type == VERTICAL_WHEEL) {
if (mCarousel.type == VERTICAL_WHEEL || mCarousel.type == HORIZONTAL_WHEEL) {
comp->setRotationDegrees(mCarousel.logoRotation * distance);
comp->setRotationOrigin(mCarousel.logoRotationOrigin);
}
@ -545,7 +560,7 @@ void SystemView::renderExtras(const Transform4x4f& trans, float lower, float upp
if (mShowing || index == mCursor)
{
Transform4x4f extrasTrans = trans;
if (mCarousel.type == HORIZONTAL)
if (mCarousel.type == HORIZONTAL || mCarousel.type == HORIZONTAL_WHEEL)
extrasTrans.translate(Vector3f((i - mExtrasCamOffset) * mSize.x(), 0, 0));
else
extrasTrans.translate(Vector3f(0, (i - mExtrasCamOffset) * mSize.y(), 0));
@ -616,6 +631,8 @@ void SystemView::getCarouselFromTheme(const ThemeData::ThemeElement* elem)
mCarousel.type = VERTICAL;
else if (!(elem->get<std::string>("type").compare("vertical_wheel")))
mCarousel.type = VERTICAL_WHEEL;
else if (!(elem->get<std::string>("type").compare("horizontal_wheel")))
mCarousel.type = HORIZONTAL_WHEEL;
else
mCarousel.type = HORIZONTAL;
}
@ -637,7 +654,7 @@ void SystemView::getCarouselFromTheme(const ThemeData::ThemeElement* elem)
mCarousel.zIndex = elem->get<float>("zIndex");
if (elem->has("logoRotation"))
mCarousel.logoRotation = elem->get<float>("logoRotation");
if (elem->has("logoRotationOrigin"))
if (elem->has("logoRotationOrigin"))
mCarousel.logoRotationOrigin = elem->get<Vector2f>("logoRotationOrigin");
if (elem->has("logoAlignment"))
{

3
es-app/src/views/SystemView.h
View file

@ -15,7 +15,8 @@ enum CarouselType : unsigned int
{
HORIZONTAL = 0,
VERTICAL = 1,
VERTICAL_WHEEL = 2
VERTICAL_WHEEL = 2,
HORIZONTAL_WHEEL = 3
};
struct SystemViewData

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

@ -252,8 +252,9 @@ const Transform4x4f& GuiComponent::getTransform()
if (mRotation != 0.0)
{
// Calculate offset as difference between origin and rotation origin
float xOff = (mOrigin.x() - mRotationOrigin.x()) * mSize.x();
float yOff = (mOrigin.y() - mRotationOrigin.y()) * mSize.y();
Vector2f rotationSize = getRotationSize();
float xOff = (mOrigin.x() - mRotationOrigin.x()) * rotationSize.x();
float yOff = (mOrigin.y() - mRotationOrigin.y()) * rotationSize.y();
// transform to offset point
if (xOff != 0.0 || yOff != 0.0)

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

@ -61,6 +61,8 @@ public:
void setSize(float w, float h);
virtual void onSizeChanged() {};
virtual Vector2f getRotationSize() const { return getSize(); };
float getRotation() const;
void setRotation(float rotation);
inline void setRotationDegrees(float rotation) { setRotation((float)ES_DEG_TO_RAD(rotation)); }

1
es-core/src/Settings.cpp
View file

@ -13,6 +13,7 @@ std::vector<const char*> settings_dont_save {
{ "Debug" },
{ "DebugGrid" },
{ "DebugText" },
{ "DebugImage" },
{ "ForceKid" },
{ "ForceKiosk" },
{ "IgnoreGamelist" },

5
es-core/src/Window.cpp
View file

@ -168,6 +168,11 @@ void Window::input(InputConfig* config, Input input)
// toggle TextComponent debug view with Ctrl-T
Settings::getInstance()->setBool("DebugText", !Settings::getInstance()->getBool("DebugText"));
}
else if(config->getDeviceId() == DEVICE_KEYBOARD && input.value && input.id == SDLK_i && SDL_GetModState() & KMOD_LCTRL && Settings::getInstance()->getBool("Debug"))
{
// toggle TextComponent debug view with Ctrl-I
Settings::getInstance()->setBool("DebugImage", !Settings::getInstance()->getBool("DebugImage"));
}
else
{
if (peekGui())

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

@ -3,6 +3,7 @@
#include "resources/TextureResource.h"
#include "Log.h"
#include "Renderer.h"
#include "Settings.h"
#include "ThemeData.h"
Vector2i ImageComponent::getTextureSize() const
@ -15,7 +16,7 @@ Vector2i ImageComponent::getTextureSize() const
ImageComponent::ImageComponent(Window* window, bool forceLoad, bool dynamic) : GuiComponent(window),
mTargetIsMax(false), mFlipX(false), mFlipY(false), mTargetSize(0, 0), mColorShift(0xFFFFFFFF),
mForceLoad(forceLoad), mDynamic(dynamic), mFadeOpacity(0), mFading(false)
mForceLoad(forceLoad), mDynamic(dynamic), mFadeOpacity(0), mFading(false), mRotateByTargetSize(false)
{
updateColors();
}
@ -141,6 +142,16 @@ void ImageComponent::setMaxSize(float width, float height)
resize();
}
Vector2f ImageComponent::getRotationSize() const
{
return mRotateByTargetSize ? mTargetSize : mSize;
}
void ImageComponent::setRotateByTargetSize(bool rotate)
{
mRotateByTargetSize = rotate;
}
void ImageComponent::setFlipX(bool flip)
{
mFlipX = flip;
@ -229,6 +240,11 @@ void ImageComponent::render(const Transform4x4f& parentTrans)
if(mTexture && mOpacity > 0)
{
if(Settings::getInstance()->getBool("DebugImage")) {
Vector2f targetSizePos = (mTargetSize - mSize) * mOrigin * -1;
Renderer::drawRect(targetSizePos.x(), targetSizePos.y(), mTargetSize.x(), mTargetSize.y(), 0xFF000033);
Renderer::drawRect(0.0f, 0.0f, mSize.x(), mSize.y(), 0x00000033);
}
if(mTexture->isInitialized())
{
// actually draw the image

5
es-core/src/components/ImageComponent.h
View file

@ -40,12 +40,16 @@ public:
void setMaxSize(float width, float height);
inline void setMaxSize(const Vector2f& size) { setMaxSize(size.x(), size.y()); }
Vector2f getRotationSize() const override;
// Multiply all pixels in the image by this color when rendering.
void setColorShift(unsigned int color);
void setFlipX(bool flip); // Mirror on the X axis.
void setFlipY(bool flip); // Mirror on the Y axis.
void setRotateByTargetSize(bool rotate); // Flag indicating if rotation should be based on target size vs. actual size.
// Returns the size of the current texture, or (0, 0) if none is loaded. May be different than drawn size (use getSize() for that).
Vector2i getTextureSize() const;
@ -86,6 +90,7 @@ private:
bool mFading;
bool mForceLoad;
bool mDynamic;
bool mRotateByTargetSize;
};
#endif // ES_CORE_COMPONENTS_IMAGE_COMPONENT_H