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

Re-re-fix wpad scaling. For real this time. 

== DETAILS

@r-type got me the link to the fixed-fixed version.

Which was actually closer to where I was originally!

So:

- Revert the previous commit
- Apply the actual changes needed to fix the problem
- Bring in and fix the logging code from the previous implementation

== TESTING
- Verified that top-left is -0x7fff,-0x7fff and that bottom-right is
  0x7fff, 0x7fff.

== REVIEW
@QuarkTheAwesome @r-type @twinaphex
This commit is contained in:
gblues 2018-01-03 21:32:00 -08:00
parent c1ef5c5497
commit 80cdb92154
1 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
wiiu/input/wpad_driver.c
View File

@ -86,18 +86,50 @@ static void apply_clamping(VPADTouchData *point, struct video_viewport *viewport
}
}
static void get_touch_coordinates(VPADTouchData *point, VPADStatus *vpad, bool *clamped)
static void get_touch_coordinates(VPADTouchData *point, VPADStatus *vpad, struct video_viewport *viewport, bool *clamped)
{
struct video_viewport viewport = {0};
video_driver_get_viewport_info(&viewport);
get_calibrated_point(point, &viewport, vpad);
apply_clamping(point, &viewport, clamped);
get_calibrated_point(point, viewport, vpad);
apply_clamping(point, viewport, clamped);
}
#if 0
/**
* Get absolute value of a signed integer using bit manipulation.
*/
static int16_t bitwise_abs(int16_t value)
{
bool is_negative = value & 0x8000;
if(!is_negative)
return value;
value = value &~ 0x8000;
return (~value & 0x7fff)+1;
}
/**
* printf doesn't have a concept of a signed hex digit, so we fake it.
*/
static void log_coords(int16_t x, int16_t y)
{
bool x_negative = x & 0x8000;
bool y_negative = y & 0x8000;
int16_t x_digit = bitwise_abs(x);
int16_t y_digit = bitwise_abs(y);
RARCH_LOG("[wpad]: calibrated point: %s%04x, %s%04x\n",
x_negative ? "-" : "",
x_digit,
y_negative ? "-" : "",
y_digit);
}
#endif
static void update_touch_state(int16_t state[3][2], uint64_t *buttons, VPADStatus *vpad)
{
VPADTouchData point = {0};
struct video_viewport viewport = {0};
bool touch_clamped = false;
if(!vpad->tpNormal.touched || vpad->tpNormal.validity != VPAD_VALID)
@ -106,10 +138,17 @@ static void update_touch_state(int16_t state[3][2], uint64_t *buttons, VPADStatu
return;
}
get_touch_coordinates(&point, vpad, &touch_clamped);
video_driver_get_viewport_info(&viewport);
get_touch_coordinates(&point, vpad, &viewport, &touch_clamped);
state[WIIU_DEVICE_INDEX_TOUCHPAD][RETRO_DEVICE_ID_ANALOG_X] = scale_touchpad(viewport.x, viewport.x + viewport.width, -0x7fff, 0x7fff, point.x);
state[WIIU_DEVICE_INDEX_TOUCHPAD][RETRO_DEVICE_ID_ANALOG_Y] = scale_touchpad(viewport.y, viewport.y + viewport.height, -0x7fff, 0x7fff, point.y);
#if 0
log_coords(state[WIIU_DEVICE_INDEX_TOUCHPAD][RETRO_DEVICE_ID_ANALOG_X],
state[WIIU_DEVICE_INDEX_TOUCHPAD][RETRO_DEVICE_ID_ANALOG_Y]);
#endif
state[WIIU_DEVICE_INDEX_TOUCHPAD][RETRO_DEVICE_ID_ANALOG_X] = point.x;
state[WIIU_DEVICE_INDEX_TOUCHPAD][RETRO_DEVICE_ID_ANALOG_Y] = point.y;
if(!touch_clamped)
*buttons |= VPAD_BUTTON_TOUCH;