eaw/Main_MiSTer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scale N64 analog optimally for different gate shapes (#834)

Browse Source 
* Scale N64 analog optimally wrt gate shapes

* Limit max_range to near diagonals

* Make magic numbers adjustable constants
This commit is contained in:
Patrick Pollock
2023-10-10 13:05:52 -06:00
committed by GitHub
parent c9994f9dd2
commit 22834acc98
3 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
input.cpp
View File

@@ -16,6 +16,7 @@
#include <sys/time.h>
#include <sys/types.h>
#include <stdarg.h>
#include <math.h>
#include "input.h"
#include "user_io.h"
@@ -1198,7 +1199,9 @@ typedef struct
char id[80];
char name[128];
char sysfs[512];
int max_range;
int ss_range;
int max_cardinal;
float max_range;
} devInput;
static devInput input[NUMDEV] = {};
@@ -2088,14 +2091,25 @@ static void joy_analog(int dev, int axis, int offset, int stick = 0)
int y = pos[stick][num][1];
if (is_n64() && stick == 0)
{
// Update maximum observed cardinal distance
const int abs_x = abs(x);
const int abs_y = abs(y);
if (abs_x > input[dev].max_range) input[dev].max_range = abs_x;
if (abs_y > input[dev].max_range) input[dev].max_range = abs_y;
if (abs_x > input[dev].max_cardinal) input[dev].max_cardinal = abs_x;
if (abs_y > input[dev].max_cardinal) input[dev].max_cardinal = abs_y;
// Update maximum observed diag
// Use sum of squares and only calc sqrt() when necessary
const int ss_range_curr = x*x + y*y;
// compare to max ss_range and update if larger
if ((ss_range_curr > input[dev].ss_range) & (abs(abs_x - abs_y) <= 3))
{
input[dev].ss_range = ss_range_curr;
input[dev].max_range = sqrt(ss_range_curr);
}
// emulate n64 joystick range and shape for regular -127-+127 controllers
n64_joy_emu(x, y, &x, &y, input[dev].max_range);
n64_joy_emu(x, y, &x, &y, input[dev].max_cardinal, input[dev].max_range);
}
if(stick) user_io_r_analog_joystick(num, (char)x, (char)y);
else user_io_l_analog_joystick(num, (char)x, (char)y);