mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-15 18:49:51 +01:00
Merge __CtrlSetAnalogX/Y into one function. Always called together.
This commit is contained in:
1 parent
7eaa687140
commit
cd8cfcfcd7
7 files changed
+33
-43
No files matched your search
+9
-10
@@ -170,8 +170,7 @@ static void SetPSPAxis(char axis, float value, int stick) {
|
||||
// It's a bit non-ideal to run through this twice, once for each axis, but...
|
||||
ConvertAnalogStick(x, y);
|
||||
|
||||
__CtrlSetAnalogX(x, stick);
|
||||
__CtrlSetAnalogY(y, stick);
|
||||
__CtrlSetAnalogXY(stick, x, y);
|
||||
}
|
||||
|
||||
EmuScreen::EmuScreen(const Path &filename)
|
||||
@@ -729,14 +728,12 @@ void EmuScreen::onVKeyUp(int virtualKeyCode) {
|
||||
|
||||
case VIRTKEY_ANALOG_ROTATE_CW:
|
||||
autoRotatingAnalogCW_ = false;
|
||||
__CtrlSetAnalogX(0.0f, 0);
|
||||
__CtrlSetAnalogY(0.0f, 0);
|
||||
__CtrlSetAnalogXY(0, 0.0f, 0.0f);
|
||||
break;
|
||||
|
||||
case VIRTKEY_ANALOG_ROTATE_CCW:
|
||||
autoRotatingAnalogCCW_ = false;
|
||||
__CtrlSetAnalogX(0.0f, 0);
|
||||
__CtrlSetAnalogY(0.0f, 0);
|
||||
__CtrlSetAnalogXY(0, 0.0f, 0.0f);
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -986,12 +983,14 @@ void EmuScreen::update() {
|
||||
if (autoRotatingAnalogCW_) {
|
||||
const float now = time_now_d();
|
||||
// Clamp to a square
|
||||
__CtrlSetAnalogX(std::min(1.0f, std::max(-1.0f, 1.42f*cosf(now*-g_Config.fAnalogAutoRotSpeed))), 0);
|
||||
__CtrlSetAnalogY(std::min(1.0f, std::max(-1.0f, 1.42f*sinf(now*-g_Config.fAnalogAutoRotSpeed))), 0);
|
||||
float x = std::min(1.0f, std::max(-1.0f, 1.42f * cosf(now * -g_Config.fAnalogAutoRotSpeed)));
|
||||
float y = std::min(1.0f, std::max(-1.0f, 1.42f * sinf(now * -g_Config.fAnalogAutoRotSpeed)));
|
||||
__CtrlSetAnalogXY(0, x, y);
|
||||
} else if (autoRotatingAnalogCCW_) {
|
||||
const float now = time_now_d();
|
||||
__CtrlSetAnalogX(std::min(1.0f, std::max(-1.0f, 1.42f*cosf(now*g_Config.fAnalogAutoRotSpeed))), 0);
|
||||
__CtrlSetAnalogY(std::min(1.0f, std::max(-1.0f, 1.42f*sinf(now*g_Config.fAnalogAutoRotSpeed))), 0);
|
||||
float x = std::min(1.0f, std::max(-1.0f, 1.42f * cosf(now * g_Config.fAnalogAutoRotSpeed)));
|
||||
float y = std::min(1.0f, std::max(-1.0f, 1.42f * sinf(now * g_Config.fAnalogAutoRotSpeed)));
|
||||
__CtrlSetAnalogXY(0, x, y);
|
||||
}
|
||||
|
||||
// This is here to support the iOS on screen back button.
|
||||
|
||||
+7
-10
@@ -199,8 +199,7 @@ void AnalogRotationButton::Touch(const TouchInput &input) {
|
||||
autoRotating_ = true;
|
||||
} else if (lastDown && !down) {
|
||||
autoRotating_ = false;
|
||||
__CtrlSetAnalogX(0.0f, 0);
|
||||
__CtrlSetAnalogY(0.0f, 0);
|
||||
__CtrlSetAnalogXY(0, 0.0f, 0.0f);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -215,8 +214,9 @@ void AnalogRotationButton::Update() {
|
||||
if (autoRotating_) {
|
||||
float speed = clockWise_ ? -g_Config.fAnalogAutoRotSpeed : g_Config.fAnalogAutoRotSpeed;
|
||||
// Clamp to a square
|
||||
__CtrlSetAnalogX(std::min(1.0f, std::max(-1.0f, 1.42f*cosf(now*speed))), 0);
|
||||
__CtrlSetAnalogY(std::min(1.0f, std::max(-1.0f, 1.42f*sinf(now*speed))), 0);
|
||||
__CtrlSetAnalogXY(0,
|
||||
std::min(1.0f, std::max(-1.0f, 1.42f*cosf(now*speed))),
|
||||
std::min(1.0f, std::max(-1.0f, 1.42f*sinf(now*speed))));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -441,8 +441,7 @@ void PSPStick::Touch(const TouchInput &input) {
|
||||
dragPointerId_ = -1;
|
||||
centerX_ = bounds_.centerX();
|
||||
centerY_ = bounds_.centerY();
|
||||
__CtrlSetAnalogX(0.0f, stick_);
|
||||
__CtrlSetAnalogY(0.0f, stick_);
|
||||
__CtrlSetAnalogXY(stick_, 0.0f, 0.0f);
|
||||
return;
|
||||
}
|
||||
if (input.flags & TOUCH_DOWN) {
|
||||
@@ -492,11 +491,9 @@ void PSPStick::ProcessTouch(float x, float y, bool down) {
|
||||
dx = std::min(1.0f, std::max(-1.0f, dx));
|
||||
dy = std::min(1.0f, std::max(-1.0f, dy));
|
||||
|
||||
__CtrlSetAnalogX(dx, stick_);
|
||||
__CtrlSetAnalogY(-dy, stick_);
|
||||
__CtrlSetAnalogXY(stick_, dx, -dy);
|
||||
} else {
|
||||
__CtrlSetAnalogX(0.0f, stick_);
|
||||
__CtrlSetAnalogY(0.0f, stick_);
|
||||
__CtrlSetAnalogXY(stick_, 0.0f, 0.0f);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -96,8 +96,7 @@ void TiltEventProcessor::TranslateTiltToInput(const Tilt &tilt) {
|
||||
}
|
||||
|
||||
void TiltEventProcessor::GenerateAnalogStickEvent(const Tilt &tilt) {
|
||||
__CtrlSetAnalogX(clamp(tilt.x_), CTRL_STICK_LEFT);
|
||||
__CtrlSetAnalogY(clamp(tilt.y_), CTRL_STICK_LEFT);
|
||||
__CtrlSetAnalogXY(CTRL_STICK_LEFT, clamp(tilt.x_), clamp(tilt.y_));
|
||||
tiltAnalogSet = true;
|
||||
}
|
||||
|
||||
@@ -182,8 +181,7 @@ void TiltEventProcessor::ResetTiltEvents() {
|
||||
tiltButtonsDown = 0;
|
||||
|
||||
if (tiltAnalogSet) {
|
||||
__CtrlSetAnalogX(0.0f, CTRL_STICK_LEFT);
|
||||
__CtrlSetAnalogY(0.0f, CTRL_STICK_LEFT);
|
||||
__CtrlSetAnalogXY(CTRL_STICK_LEFT, 0.0f, 0.0f);
|
||||
tiltAnalogSet = false;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user