Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Oops, fix auto-hide timing issues.

Browse Source 
If the game was not 60 fps, it was wrong, but also it added up frames too
quickly as static.  Was worried about missing touches when I added the
zeroing, dumb mistake.

Fixes #8309.
This commit is contained in:
Unknown W. Brackets 2015-12-26 11:31:37 -08:00
parent b278299324
commit da65116f75
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
UI/GamepadEmu.cpp
View File

@ -15,46 +15,50 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "GamepadEmu.h"
#include <algorithm>
#include "Common/Log.h"
#include "Core/Config.h"
#include "Core/System.h"
#include "Core/HLE/sceCtrl.h"
#include "UI/GamepadEmu.h"
#include "UI/ui_atlas.h"
#include "base/colorutil.h"
#include "base/display.h"
#include "base/NativeApp.h"
#include "base/timeutil.h"
#include "math/math_util.h"
#include "ui/virtual_input.h"
#include "ui/ui_context.h"
#include "Core/Config.h"
#include "Core/System.h"
#include "ui_atlas.h"
#include "Core/HLE/sceCtrl.h"
#include <algorithm>
static u32 GetButtonColor() {
return g_Config.iTouchButtonStyle == 1 ? 0xFFFFFF : 0xc0b080;
}
int GamepadView::framesWithoutTouch_;
void GamepadView::Touch(const TouchInput &input) {
framesWithoutTouch_ = 0;
secondsWithoutTouch_ = 0.0f;
}
void GamepadView::Update(const InputState &input) {
++framesWithoutTouch_;
const float now = time_now();
float delta = now - lastFrameTime_;
if (delta > 0) {
secondsWithoutTouch_ += delta;
}
lastFrameTime_ = now;
}
float GamepadView::GetButtonOpacity() {
int fadeAfterFrames = g_Config.iTouchButtonHideSeconds * 60;
int fadeTransitionFrames = std::min(fadeAfterFrames, 5 * 60);
float fadeAfterSeconds = g_Config.iTouchButtonHideSeconds;
float fadeTransitionSeconds = std::min(fadeAfterSeconds, 0.5f);
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
float multiplier = 1.0f;
if (framesWithoutTouch_ > fadeAfterFrames && fadeAfterFrames != 0) {
if (framesWithoutTouch_ > fadeAfterFrames + fadeTransitionFrames) {
if (secondsWithoutTouch_ >= fadeAfterSeconds && fadeAfterSeconds > 0.0f) {
if (secondsWithoutTouch_ >= fadeAfterSeconds + fadeTransitionSeconds) {
multiplier = 0.0f;
} else {
int framesIntoFade = framesWithoutTouch_ - fadeAfterFrames;
multiplier = 1.0f - (framesIntoFade / (float)fadeTransitionFrames);
float secondsIntoFade = secondsWithoutTouch_ - fadeAfterSeconds;
multiplier = 1.0f - (secondsIntoFade / fadeTransitionSeconds);
}
}

5
UI/GamepadEmu.h
View File

@ -25,7 +25,7 @@
class GamepadView : public UI::View {
public:
GamepadView(UI::LayoutParams *layoutParams) : UI::View(layoutParams) {
GamepadView(UI::LayoutParams *layoutParams) : UI::View(layoutParams), lastFrameTime_(0.0f), secondsWithoutTouch_(0) {
}
void Touch(const TouchInput &input) override;
@ -37,7 +37,8 @@ public:
protected:
float GetButtonOpacity();
static int framesWithoutTouch_;
float lastFrameTime_;
float secondsWithoutTouch_;
};
class MultiTouchButton : public GamepadView {