The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-11-24 03:29:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove redundant function

Browse Source
This commit is contained in:
dborth 2008-10-03 21:52:57 +00:00
parent e3e76e1d3d
commit 463cd3b7e5
5 changed files with 77 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/ngc/filesel.cpp
View File

@ -275,8 +275,8 @@ int FileSelector (int method)
p = PAD_ButtonsDown (0); p = PAD_ButtonsDown (0);
ph = PAD_ButtonsHeld (0); ph = PAD_ButtonsHeld (0);
#ifdef HW_RVL #ifdef HW_RVL
wm_ay = WPAD_StickY (0, 0); wm_ay = WPAD_Stick (0, 0, 1);
wm_sx = WPAD_StickX (0, 1); wm_sx = WPAD_Stick (0, 1, 0);
wp = WPAD_ButtonsDown (0); wp = WPAD_ButtonsDown (0);
wh = WPAD_ButtonsHeld (0); wh = WPAD_ButtonsHeld (0);

132
source/ngc/input.cpp
View File

@ -46,7 +46,8 @@ extern int ConfigRequested;
S9xMapButton( keycode, cmd = S9xGetCommandT(snescmd), false) S9xMapButton( keycode, cmd = S9xGetCommandT(snescmd), false)
/*** Gamecube controller Padmap ***/ /*** Gamecube controller Padmap ***/
unsigned int gcpadmap[] = { PAD_BUTTON_A, PAD_BUTTON_B, unsigned int gcpadmap[] = {
PAD_BUTTON_A, PAD_BUTTON_B,
PAD_BUTTON_X, PAD_BUTTON_Y, PAD_BUTTON_X, PAD_BUTTON_Y,
PAD_TRIGGER_L, PAD_TRIGGER_R, PAD_TRIGGER_L, PAD_TRIGGER_R,
PAD_TRIGGER_Z, PAD_BUTTON_START, PAD_TRIGGER_Z, PAD_BUTTON_START,
@ -54,7 +55,8 @@ unsigned int gcpadmap[] = { PAD_BUTTON_A, PAD_BUTTON_B,
PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT
}; };
/*** Wiimote Padmap ***/ /*** Wiimote Padmap ***/
unsigned int wmpadmap[] = { WPAD_BUTTON_B, WPAD_BUTTON_2, unsigned int wmpadmap[] = {
WPAD_BUTTON_B, WPAD_BUTTON_2,
WPAD_BUTTON_1, WPAD_BUTTON_A, WPAD_BUTTON_1, WPAD_BUTTON_A,
0x0000, 0x0000, 0x0000, 0x0000,
WPAD_BUTTON_MINUS, WPAD_BUTTON_PLUS, WPAD_BUTTON_MINUS, WPAD_BUTTON_PLUS,
@ -62,7 +64,8 @@ unsigned int wmpadmap[] = { WPAD_BUTTON_B, WPAD_BUTTON_2,
WPAD_BUTTON_UP, WPAD_BUTTON_DOWN WPAD_BUTTON_UP, WPAD_BUTTON_DOWN
}; };
/*** Classic Controller Padmap ***/ /*** Classic Controller Padmap ***/
unsigned int ccpadmap[] = { WPAD_CLASSIC_BUTTON_A, WPAD_CLASSIC_BUTTON_B, unsigned int ccpadmap[] = {
WPAD_CLASSIC_BUTTON_A, WPAD_CLASSIC_BUTTON_B,
WPAD_CLASSIC_BUTTON_X, WPAD_CLASSIC_BUTTON_Y, WPAD_CLASSIC_BUTTON_X, WPAD_CLASSIC_BUTTON_Y,
WPAD_CLASSIC_BUTTON_FULL_L, WPAD_CLASSIC_BUTTON_FULL_R, WPAD_CLASSIC_BUTTON_FULL_L, WPAD_CLASSIC_BUTTON_FULL_R,
WPAD_CLASSIC_BUTTON_MINUS, WPAD_CLASSIC_BUTTON_PLUS, WPAD_CLASSIC_BUTTON_MINUS, WPAD_CLASSIC_BUTTON_PLUS,
@ -70,10 +73,11 @@ unsigned int ccpadmap[] = { WPAD_CLASSIC_BUTTON_A, WPAD_CLASSIC_BUTTON_B,
WPAD_CLASSIC_BUTTON_LEFT, WPAD_CLASSIC_BUTTON_RIGHT WPAD_CLASSIC_BUTTON_LEFT, WPAD_CLASSIC_BUTTON_RIGHT
}; };
/*** Nunchuk + wiimote Padmap ***/ /*** Nunchuk + wiimote Padmap ***/
unsigned int ncpadmap[] = { WPAD_BUTTON_A, WPAD_BUTTON_B, unsigned int ncpadmap[] = {
WPAD_BUTTON_A, WPAD_BUTTON_B,
WPAD_NUNCHUK_BUTTON_C, WPAD_NUNCHUK_BUTTON_Z, WPAD_NUNCHUK_BUTTON_C, WPAD_NUNCHUK_BUTTON_Z,
WPAD_BUTTON_MINUS, WPAD_BUTTON_PLUS,
WPAD_BUTTON_2, WPAD_BUTTON_1, WPAD_BUTTON_2, WPAD_BUTTON_1,
WPAD_BUTTON_MINUS, WPAD_BUTTON_PLUS,
WPAD_BUTTON_UP, WPAD_BUTTON_DOWN, WPAD_BUTTON_UP, WPAD_BUTTON_DOWN,
WPAD_BUTTON_LEFT, WPAD_BUTTON_RIGHT WPAD_BUTTON_LEFT, WPAD_BUTTON_RIGHT
}; };
@ -95,12 +99,12 @@ unsigned int gcjustmap[] = { PAD_BUTTON_A, PAD_BUTTON_B, PAD_BUTTON_START };
unsigned int wmjustmap[] = { WPAD_BUTTON_A, WPAD_BUTTON_B, WPAD_BUTTON_PLUS }; unsigned int wmjustmap[] = { WPAD_BUTTON_A, WPAD_BUTTON_B, WPAD_BUTTON_PLUS };
/**************************************************************************** /****************************************************************************
* WPAD_StickX * WPAD_Stick
* *
* Get X value from Wii Joystick (classic, nunchuk) input * Get X/Y value from Wii Joystick (classic, nunchuk) input
***************************************************************************/ ***************************************************************************/
s8 WPAD_StickX(u8 chan,u8 right) s8 WPAD_Stick(u8 chan, u8 right, int axis)
{ {
float mag = 0.0; float mag = 0.0;
float ang = 0.0; float ang = 0.0;
@ -134,58 +138,15 @@ s8 WPAD_StickX(u8 chan,u8 right)
break; break;
} }
/* calculate X value (angle need to be converted into radian) */ /* calculate x/y value (angle need to be converted into radian) */
if (mag > 1.0) mag = 1.0; if (mag > 1.0) mag = 1.0;
else if (mag < -1.0) mag = -1.0; else if (mag < -1.0) mag = -1.0;
double val = mag * sin((PI * ang)/180.0f); double val;
return (s8)(val * 128.0f); if(axis == 0) // x-axis
} val = mag * sin((PI * ang)/180.0f);
else // y-axis
/**************************************************************************** val = mag * cos((PI * ang)/180.0f);
* WPAD_StickY
*
* Get Y value from Wii Joystick (classic, nunchuk) input
***************************************************************************/
s8 WPAD_StickY(u8 chan, u8 right)
{
float mag = 0.0;
float ang = 0.0;
WPADData *data = WPAD_Data(chan);
switch (data->exp.type)
{
case WPAD_EXP_NUNCHUK:
case WPAD_EXP_GUITARHERO3:
if (right == 0)
{
mag = data->exp.nunchuk.js.mag;
ang = data->exp.nunchuk.js.ang;
}
break;
case WPAD_EXP_CLASSIC:
if (right == 0)
{
mag = data->exp.classic.ljs.mag;
ang = data->exp.classic.ljs.ang;
}
else
{
mag = data->exp.classic.rjs.mag;
ang = data->exp.classic.rjs.ang;
}
break;
default:
break;
}
/* calculate X value (angle need to be converted into radian) */
if (mag > 1.0) mag = 1.0;
else if (mag < -1.0) mag = -1.0;
double val = mag * cos((PI * ang)/180.0f);
return (s8)(val * 128.0f); return (s8)(val * 128.0f);
} }
@ -236,8 +197,8 @@ void UpdateCursorPosition (int pad, int &pos_x, int &pos_y)
} }
else else
{ {
signed char wm_ax = WPAD_StickX (pad, 0); signed char wm_ax = WPAD_Stick (pad, 0, 0);
signed char wm_ay = WPAD_StickY (pad, 0); signed char wm_ay = WPAD_Stick (pad, 0, 1);
if (wm_ax > SCOPEPADCAL){ if (wm_ax > SCOPEPADCAL){
pos_x += (wm_ax*1.0)/SCOPEPADCAL; pos_x += (wm_ax*1.0)/SCOPEPADCAL;
@ -266,7 +227,7 @@ void UpdateCursorPosition (int pad, int &pos_x, int &pos_y)
* *
* Reads the changes (buttons pressed, etc) from a controller and reports * Reads the changes (buttons pressed, etc) from a controller and reports
* these changes to Snes9x * these changes to Snes9x
****************************************************************************/ ***************************************************************************/
void decodepad (int pad) void decodepad (int pad)
{ {
@ -281,12 +242,13 @@ void decodepad (int pad)
signed char wm_ax = 0; signed char wm_ax = 0;
signed char wm_ay = 0; signed char wm_ay = 0;
u32 wp = 0; u32 wp = 0;
wm_ax = WPAD_StickX ((u8)pad, 0); wm_ax = WPAD_Stick ((u8)pad, 0, 0);
wm_ay = WPAD_StickY ((u8)pad, 0); wm_ay = WPAD_Stick ((u8)pad, 0, 1);
wp = WPAD_ButtonsHeld (pad); wp = WPAD_ButtonsHeld (pad);
u32 exp_type; u32 exp_type;
if ( WPAD_Probe(pad, &exp_type) != 0 ) exp_type = WPAD_EXP_NONE; if ( WPAD_Probe(pad, &exp_type) != 0 )
exp_type = WPAD_EXP_NONE;
#endif #endif
/*** /***
@ -307,7 +269,6 @@ void decodepad (int pad)
if (pad_x != 0 && pad_y != 0) if (pad_x != 0 && pad_y != 0)
{ {
/*** Recalc left / right ***/ /*** Recalc left / right ***/
t = (float) pad_y / pad_x; t = (float) pad_y / pad_x;
if (t >= -2.41421356237 && t < 2.41421356237) if (t >= -2.41421356237 && t < 2.41421356237)
@ -348,7 +309,6 @@ void decodepad (int pad)
if (wm_ax != 0 && wm_ay != 0) if (wm_ax != 0 && wm_ay != 0)
{ {
/*** Recalc left / right ***/ /*** Recalc left / right ***/
t = (float) wm_ay / wm_ax; t = (float) wm_ay / wm_ax;
if (t >= -2.41421356237 && t < 2.41421356237) if (t >= -2.41421356237 && t < 2.41421356237)
@ -391,67 +351,69 @@ void decodepad (int pad)
} }
/*** Superscope ***/ /*** Superscope ***/
if (Settings.SuperScopeMaster && pad == GCSettings.Superscope-1) // report only once if (Settings.SuperScopeMaster && pad == GCSettings.Superscope - 1) // report only once
{ {
// buttons // buttons
offset = 0x50; offset = 0x50;
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
{ {
if ( jp & gcscopemap[i] if (jp & gcscopemap[i]
#ifdef HW_RVL #ifdef HW_RVL
|| wp & wmscopemap[i] || wp & wmscopemap[i]
#endif #endif
) )
S9xReportButton (offset + i, true); S9xReportButton(offset + i, true);
else else
S9xReportButton (offset + i, false); S9xReportButton(offset + i, false);
} }
// pointer // pointer
offset = 0x80; offset = 0x80;
UpdateCursorPosition (pad, cursor_x[0], cursor_y[0]); UpdateCursorPosition(pad, cursor_x[0], cursor_y[0]);
S9xReportPointer(offset, (u16)cursor_x[0], (u16)cursor_y[0]); S9xReportPointer(offset, (u16) cursor_x[0], (u16) cursor_y[0]);
} }
/*** Mouse ***/ /*** Mouse ***/
else if (Settings.MouseMaster && pad < GCSettings.Mouse) else if (Settings.MouseMaster && pad < GCSettings.Mouse)
{ {
// buttons // buttons
offset = 0x60+(2*pad); offset = 0x60 + (2 * pad);
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
if ( jp & gcmousemap[i] if (jp & gcmousemap[i]
#ifdef HW_RVL #ifdef HW_RVL
|| wp & wmmousemap[i] || wp & wmmousemap[i]
#endif #endif
) )
S9xReportButton (offset + i, true); S9xReportButton(offset + i, true);
else else
S9xReportButton (offset + i, false); S9xReportButton(offset + i, false);
} }
// pointer // pointer
offset = 0x81; offset = 0x81;
UpdateCursorPosition (pad, cursor_x[1+pad], cursor_y[1+pad]); UpdateCursorPosition(pad, cursor_x[1 + pad], cursor_y[1 + pad]);
S9xReportPointer(offset+pad, (u16)cursor_x[1+pad], (u16)cursor_y[1+pad]); S9xReportPointer(offset + pad, (u16) cursor_x[1 + pad],
(u16) cursor_y[1 + pad]);
} }
/*** Justifier ***/ /*** Justifier ***/
else if (Settings.JustifierMaster && pad < GCSettings.Justifier) else if (Settings.JustifierMaster && pad < GCSettings.Justifier)
{ {
// buttons // buttons
offset = 0x70+(3*pad); offset = 0x70 + (3 * pad);
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
if ( jp & gcjustmap[i] if (jp & gcjustmap[i]
#ifdef HW_RVL #ifdef HW_RVL
|| wp & wmjustmap[i] || wp & wmjustmap[i]
#endif #endif
) )
S9xReportButton (offset + i, true); S9xReportButton(offset + i, true);
else else
S9xReportButton (offset + i, false); S9xReportButton(offset + i, false);
} }
// pointer // pointer
offset = 0x83; offset = 0x83;
UpdateCursorPosition (pad, cursor_x[3+pad], cursor_y[3+pad]); UpdateCursorPosition(pad, cursor_x[3 + pad], cursor_y[3 + pad]);
S9xReportPointer(offset+pad, (u16)cursor_x[3+pad], (u16)cursor_y[3+pad]); S9xReportPointer(offset + pad, (u16) cursor_x[3 + pad],
(u16) cursor_y[3 + pad]);
} }
} }
@ -469,8 +431,8 @@ void NGCReportButtons ()
u16 gc_pb = PAD_ButtonsHeld (0); u16 gc_pb = PAD_ButtonsHeld (0);
#ifdef HW_RVL #ifdef HW_RVL
s8 wm_sx = WPAD_StickX (0,1); s8 wm_sx = WPAD_Stick (0,1,0);
s8 wm_sy = WPAD_StickY (0,1); s8 wm_sy = WPAD_Stick (0,1,1);
u32 wm_pb = WPAD_ButtonsHeld (0); // wiimote / expansion button info u32 wm_pb = WPAD_ButtonsHeld (0); // wiimote / expansion button info
#endif #endif

3
source/ngc/input.h
View File

@ -31,8 +31,7 @@ extern unsigned int wmmousemap[];
extern unsigned int gcjustmap[]; extern unsigned int gcjustmap[];
extern unsigned int wmjustmap[]; extern unsigned int wmjustmap[];
s8 WPAD_StickX(u8 chan,u8 right); s8 WPAD_Stick(u8 chan,u8 right, int axis);
s8 WPAD_StickY(u8 chan, u8 right);
void UpdateCursorPosition (int pad, int &pos_x, int &pos_y); void UpdateCursorPosition (int pad, int &pos_x, int &pos_y);
void decodepad (int pad); void decodepad (int pad);

4
source/ngc/menu.cpp
View File

@ -183,8 +183,8 @@ void CheatMenu()
ph = PAD_ButtonsHeld (0); ph = PAD_ButtonsHeld (0);
#ifdef HW_RVL #ifdef HW_RVL
wm_ay = WPAD_StickY (0, 0); wm_ay = WPAD_Stick (0, 0, 1);
wm_sx = WPAD_StickX (0, 1); wm_sx = WPAD_Stick (0, 1, 0);
wp = WPAD_ButtonsDown (0); wp = WPAD_ButtonsDown (0);
wh = WPAD_ButtonsHeld (0); wh = WPAD_ButtonsHeld (0);
#endif #endif

2
source/ngc/menudraw.cpp
View File

@ -585,7 +585,7 @@ RunMenu (char items[][50], int maxitems, char *title, int fontsize, int x)
gc_ay = PAD_StickY (0); gc_ay = PAD_StickY (0);
p = PAD_ButtonsDown (0); p = PAD_ButtonsDown (0);
#ifdef HW_RVL #ifdef HW_RVL
wm_ay = WPAD_StickY (0,0); wm_ay = WPAD_Stick (0,0, 1);
wp = WPAD_ButtonsDown (0); wp = WPAD_ButtonsDown (0);
#endif #endif