libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-12 12:20:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the game button hold animation time-based instead of framecount based. Fixes #7404

Browse Source
This commit is contained in:
Henrik Rydgard 2015-03-01 15:59:17 +01:00
parent bfa52e61a3
commit f861a4cc8c
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
UI/MainScreen.cpp
View File

@ -74,7 +74,7 @@ bool MainScreen::showHomebrewTab = false;
class GameButton : public UI::Clickable { class GameButton : public UI::Clickable {
public: public:
GameButton(const std::string &gamePath, bool gridStyle, UI::LayoutParams *layoutParams = 0) GameButton(const std::string &gamePath, bool gridStyle, UI::LayoutParams *layoutParams = 0)
: UI::Clickable(layoutParams), gridStyle_(gridStyle), gamePath_(gamePath), holdFrameCount_(0), holdEnabled_(true) {} : UI::Clickable(layoutParams), gridStyle_(gridStyle), gamePath_(gamePath), holdStart_(0), holdEnabled_(true) {}
void Draw(UIContext &dc) override; void Draw(UIContext &dc) override;
void GetContentDimensions(const UIContext &dc, float &w, float &h) const override { void GetContentDimensions(const UIContext &dc, float &w, float &h) const override {
@ -95,8 +95,11 @@ public:
void Touch(const TouchInput &input) override { void Touch(const TouchInput &input) override {
UI::Clickable::Touch(input); UI::Clickable::Touch(input);
hovering_ = bounds_.Contains(input.x, input.y); hovering_ = bounds_.Contains(input.x, input.y);
if (hovering_ && (input.flags & TOUCH_DOWN)) {
holdStart_ = time_now_d();
}
if (input.flags & TOUCH_UP) { if (input.flags & TOUCH_UP) {
holdFrameCount_ = 0; holdStart_ = 0;
} }
} }
@ -127,12 +130,8 @@ public:
} }
void Update(const InputState &input_state) override { void Update(const InputState &input_state) override {
if (down_ && holdEnabled_)
holdFrameCount_++;
else
holdFrameCount_ = 0;
// Hold button for 1.5 seconds to launch the game options // Hold button for 1.5 seconds to launch the game options
if (holdFrameCount_ > 90) { if (holdEnabled_ && holdStart_ != 0.0 && holdStart_ < time_now_d() - 1.5) {
TriggerOnHoldClick(); TriggerOnHoldClick();
} }
} }
@ -147,7 +146,7 @@ public:
private: private:
void TriggerOnHoldClick() { void TriggerOnHoldClick() {
holdFrameCount_ = 0; holdStart_ = 0.0;
UI::EventParams e; UI::EventParams e;
e.v = this; e.v = this;
e.s = gamePath_; e.s = gamePath_;
@ -166,7 +165,7 @@ private:
std::string gamePath_; std::string gamePath_;
std::string title_; std::string title_;
int holdFrameCount_; double holdStart_;
bool holdEnabled_; bool holdEnabled_;
bool hovering_; bool hovering_;
}; };
@ -221,8 +220,10 @@ void GameButton::Draw(UIContext &dc) {
Bounds overlayBounds = bounds_; Bounds overlayBounds = bounds_;
u32 overlayColor = 0; u32 overlayColor = 0;
if (holdEnabled_) if (holdEnabled_ && holdStart_ != 0.0) {
overlayColor = whiteAlpha((holdFrameCount_ - 15) * 0.01f); double time_held = time_now_d() - holdStart_;
overlayColor = whiteAlpha(time_held / 2.5f);
}
// Render button // Render button
int dropsize = 10; int dropsize = 10;
@ -249,10 +250,14 @@ void GameButton::Draw(UIContext &dc) {
if (texture) { if (texture) {
dc.Draw()->Flush(); dc.Draw()->Flush();
dc.GetThin3DContext()->SetTexture(0, texture); dc.GetThin3DContext()->SetTexture(0, texture);
if (holdFrameCount_ > 60) { if (holdStart_ != 0.0) {
// Blink before launching by holding double time_held = time_now_d() - holdStart_;
if (((holdFrameCount_ >> 3) & 1) == 0) int holdFrameCount = (int)(time_held * 60.0f);
color = darkenColor(color); if (holdFrameCount > 60) {
// Blink before launching by holding
if (((holdFrameCount >> 3) & 1) == 0)
color = darkenColor(color);
}
} }
dc.Draw()->DrawTexRect(x, y, x+w, y+h, 0, 0, 1, 1, color); dc.Draw()->DrawTexRect(x, y, x+w, y+h, 0, 0, 1, 1, color);
dc.Draw()->Flush(); dc.Draw()->Flush();