ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make ares64 comply with mupen's analog input scheme, allow for disabling the physical limitation / circle thingie

This commit is contained in:
CasualPokePlayer 2022-02-13 02:45:48 -08:00
parent f48f9dba9f
commit 28cfb1aa74
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/ares64.wbx.gz
View File

Binary file not shown.

6
waterbox/ares64/BizInterface.cpp
View File

@ -309,7 +309,9 @@ static inline SaveType DetectSaveType(u8* rom)
return ret; return ret;
} }
EXPORT bool Init(ControllerType* controllers, bool pal) namespace ares::Nintendo64 { extern bool RestrictAnalogRange; }
EXPORT bool Init(ControllerType* controllers, bool restrictAnalogRange, bool pal)
{ {
FILE* f; FILE* f;
array_view<u8>* data; array_view<u8>* data;
@ -415,6 +417,8 @@ EXPORT bool Init(ControllerType* controllers, bool pal)
} }
} }
ares::Nintendo64::RestrictAnalogRange = restrictAnalogRange;
root->power(false); root->power(false);
HackeryDoo(); HackeryDoo();
return true; return true;

39
waterbox/ares64/ares/ares/n64/controller/gamepad/gamepad.cpp
View File

@ -83,6 +83,8 @@ auto Gamepad::rumble(bool enable) -> void {
platform->input(motor); platform->input(motor);
} }
bool RestrictAnalogRange;
auto Gamepad::read() -> n32 { auto Gamepad::read() -> n32 {
platform->input(x); platform->input(x);
platform->input(y); platform->input(y);
@ -101,6 +103,7 @@ auto Gamepad::read() -> n32 {
platform->input(z); platform->input(z);
platform->input(start); platform->input(start);
/*
//scale {-32768 ... +32767} to {-84 ... +84} //scale {-32768 ... +32767} to {-84 ... +84}
auto ax = x->value() * 85.0 / 32767.0; auto ax = x->value() * 85.0 / 32767.0;
auto ay = y->value() * 85.0 / 32767.0; auto ay = y->value() * 85.0 / 32767.0;
@ -128,9 +131,43 @@ auto Gamepad::read() -> n32 {
ax *= scale; ax *= scale;
ay *= scale; ay *= scale;
} }
*/
auto ax = x->value() * 1.0;
auto ay = y->value() * 1.0;
if (RestrictAnalogRange) {
//scale {-128 ... +127} to {-84 ... +84}
ax = ax * 85.0 / 127.0;
ay = ay * 85.0 / 127.0;
//create scaled circular dead-zone in range {-15 ... +15}
auto length = sqrt(ax * ax + ay * ay);
if(length < 16.0) {
length = 0.0;
} else if(length > 85.0) {
length = 85.0 / length;
} else {
length = (length - 16.0) * 85.0 / 69.0 / length;
}
ax *= length;
ay *= length;
//bound diagonals to an octagonal range {-68 ... +68}
if(ax != 0.0 && ay != 0.0) {
auto slope = ay / ax;
auto edgex = copysign(85.0 / (abs(slope) + 16.0 / 69.0), ax);
auto edgey = copysign(min(abs(edgex * slope), 85.0 / (1.0 / abs(slope) + 16.0 / 69.0)), ay);
edgex = edgey / slope;
auto scale = sqrt(edgex * edgex + edgey * edgey) / 85.0;
ax *= scale;
ay *= scale;
}
}
n32 data; n32 data;
data.byte(0) = -ay; //data.byte(0) = -ay;
data.byte(0) = +ay;
data.byte(1) = +ax; data.byte(1) = +ax;
data.bit(16) = cameraRight->value(); data.bit(16) = cameraRight->value();
data.bit(17) = cameraLeft->value(); data.bit(17) = cameraLeft->value();