Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

skip unnecessary fixed point conversion + multiplication in touchscreen reading code

Browse Source
This commit is contained in:
Wolfvak 2019-05-24 09:56:35 -03:00 committed by d0k3
parent 6dc89d7107
commit bb5182cae3
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arm9/source/common/hid.c
View File

@ -41,30 +41,34 @@ static fixp_t ts_mult[2];
// ts_org indicates the coordinate system origin // ts_org indicates the coordinate system origin
static int ts_org[2]; static int ts_org[2];
bool HID_ReadTouchState(u16 *x, u16 *y)
{
u32 ts;
int xc, yc;
fixp_t tx, ty;
ts = HID_ReadRawTouchState(); bool HID_TouchCalibratedTransform(u32 ts, u16 *x, u16 *y)
{
int xc, yc;
int tx, ty;
if (ts & BIT(31)) if (ts & BIT(31))
return false; return false;
tx = INT_TO_FIXP(HID_RAW_TX(ts) - HID_TOUCH_MIDPOINT); tx = HID_RAW_TX(ts) - HID_TOUCH_MIDPOINT;
ty = INT_TO_FIXP(HID_RAW_TY(ts) - HID_TOUCH_MIDPOINT); ty = HID_RAW_TY(ts) - HID_TOUCH_MIDPOINT;
xc = FIXP_TO_INT(fixp_round(fixp_product(tx, ts_mult[0]))) + ts_org[0]; xc = FIXP_TO_INT(fixp_round(tx * ts_mult[0])) + ts_org[0];
yc = FIXP_TO_INT(fixp_round(fixp_product(ty, ts_mult[1]))) + ts_org[1]; yc = FIXP_TO_INT(fixp_round(ty * ts_mult[1])) + ts_org[1];
*x = clamp(xc, 0, (ts_org[0] * 2) - 1); *x = clamp(xc, 0, (ts_org[0] * 2) - 1);
*y = clamp(yc, 0, (ts_org[1] * 2) - 1); *y = clamp(yc, 0, (ts_org[1] * 2) - 1);
return true; return true;
} }
bool HID_SetCalibrationData(const HID_CalibrationData *calibs, int point_cnt, int screen_w, int screen_h) bool HID_ReadTouchState(u16 *x, u16 *y)
{ {
int mid_x, mid_y; return HID_TouchCalibratedTransform(HID_ReadRawTouchState(), x, y);
}
bool HID_SetCalibrationData(const HID_CalibrationData *calibs, u32 point_cnt, u32 screen_w, u32 screen_h)
{
u32 mid_x, mid_y;
fixp_t avg_x, avg_y; fixp_t avg_x, avg_y;
if (!screen_w || !screen_h || point_cnt <= 0 || point_cnt > 7) if (!screen_w || !screen_h || point_cnt <= 0 || point_cnt > 7)
@ -75,8 +79,7 @@ bool HID_SetCalibrationData(const HID_CalibrationData *calibs, int point_cnt, in
avg_x = 0; avg_x = 0;
avg_y = 0; avg_y = 0;
for (u32 i = 0; i < point_cnt; i++) {
for (int i = 0; i < point_cnt; i++) {
const HID_CalibrationData *data = &calibs[i]; const HID_CalibrationData *data = &calibs[i];
fixp_t screen_x, screen_y, touch_x, touch_y; fixp_t screen_x, screen_y, touch_x, touch_y;

3
arm9/source/common/hid.h
View File

@ -24,7 +24,8 @@ typedef struct {
u32 HID_ReadRawTouchState(void); u32 HID_ReadRawTouchState(void);
bool HID_ReadTouchState(u16 *x, u16 *y); bool HID_ReadTouchState(u16 *x, u16 *y);
bool HID_SetCalibrationData(const HID_CalibrationData *calibs, int point_cnt, int screen_w, int screen_h); bool HID_TouchCalibratedTransform(u32 ts, u16 *x, u16 *y);
bool HID_SetCalibrationData(const HID_CalibrationData *calibs, u32 point_cnt, u32 screen_w, u32 screen_h);
typedef struct { typedef struct {
u16 x; u16 x;

2
common/fixp.h
View File

@ -37,7 +37,7 @@ typedef int32_t fixp_t;
#define FIXP_ZERO_UNIT (0) #define FIXP_ZERO_UNIT (0)
#define FIXP_FRAC_MASK (FIXP_WHOLE_UNIT - 1) #define FIXP_FRAC_MASK (FIXP_WHOLE_UNIT - 1)
#define FIXP_UNIT_MASK (~0 & ~FIXP_FRAC_MASK) #define FIXP_UNIT_MASK (~FIXP_FRAC_MASK)
static inline fixp_t fixp_product(fixp_t a, fixp_t b) static inline fixp_t fixp_product(fixp_t a, fixp_t b)
{ {