The-Homebrew-Cloud/fceugx
2
0
Fork 0
mirror of https://github.com/dborth/fceugx.git synced 2025-01-07 14:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

code tidy

Browse Source
This commit is contained in:
dborth 2009-10-15 07:36:33 +00:00
parent a6129c0cfe
commit a29c51ea2a
4 changed files with 59 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/ngc/gui/gui.h
View File

@ -196,11 +196,19 @@ class GuiTrigger
//!\param wiibtns Wii controller trigger button(s) - classic controller buttons are considered separately //!\param wiibtns Wii controller trigger button(s) - classic controller buttons are considered separately
//!\param gcbtns GameCube controller trigger button(s) //!\param gcbtns GameCube controller trigger button(s)
void SetButtonOnlyInFocusTrigger(s32 ch, u32 wiibtns, u16 gcbtns); void SetButtonOnlyInFocusTrigger(s32 ch, u32 wiibtns, u16 gcbtns);
//!Get X/Y value from Wii Joystick (classic, nunchuk) input //!Get X or Y value from Wii Joystick (classic, nunchuk) input
//!\param right Controller stick (left = 0, right = 1) //!\param stick Controller stick (left = 0, right = 1)
//!\param axis Controller stick axis (x-axis = 0, y-axis = 1) //!\param axis Controller stick axis (x-axis = 0, y-axis = 1)
//!\return Stick value //!\return Stick value
s8 WPAD_Stick(u8 right, int axis); s8 WPAD_Stick(u8 stick, int axis);
//!Get X value from Wii Joystick (classic, nunchuk) input
//!\param stick Controller stick (left = 0, right = 1)
//!\return Stick value
s8 WPAD_StickX(u8 stick);
//!Get Y value from Wii Joystick (classic, nunchuk) input
//!\param stick Controller stick (left = 0, right = 1)
//!\return Stick value
s8 WPAD_StickY(u8 stick);
//!Move menu selection left (via pad/joystick). Allows scroll delay and button overriding //!Move menu selection left (via pad/joystick). Allows scroll delay and button overriding
//!\return true if selection should be moved left, false otherwise //!\return true if selection should be moved left, false otherwise
bool Left(); bool Left();

16
source/ngc/gui/gui_trigger.cpp
View File

@ -87,7 +87,7 @@ void GuiTrigger::SetButtonOnlyInFocusTrigger(s32 ch, u32 wiibtns, u16 gcbtns)
* Get X/Y value from Wii Joystick (classic, nunchuk) input * Get X/Y value from Wii Joystick (classic, nunchuk) input
***************************************************************************/ ***************************************************************************/
s8 GuiTrigger::WPAD_Stick(u8 right, int axis) s8 GuiTrigger::WPAD_Stick(u8 stick, int axis)
{ {
#ifdef HW_RVL #ifdef HW_RVL
@ -98,7 +98,7 @@ s8 GuiTrigger::WPAD_Stick(u8 right, int axis)
{ {
case WPAD_EXP_NUNCHUK: case WPAD_EXP_NUNCHUK:
case WPAD_EXP_GUITARHERO3: case WPAD_EXP_GUITARHERO3:
if (right == 0) if (stick == 0)
{ {
mag = wpad->exp.nunchuk.js.mag; mag = wpad->exp.nunchuk.js.mag;
ang = wpad->exp.nunchuk.js.ang; ang = wpad->exp.nunchuk.js.ang;
@ -106,7 +106,7 @@ s8 GuiTrigger::WPAD_Stick(u8 right, int axis)
break; break;
case WPAD_EXP_CLASSIC: case WPAD_EXP_CLASSIC:
if (right == 0) if (stick == 0)
{ {
mag = wpad->exp.classic.ljs.mag; mag = wpad->exp.classic.ljs.mag;
ang = wpad->exp.classic.ljs.ang; ang = wpad->exp.classic.ljs.ang;
@ -139,6 +139,16 @@ s8 GuiTrigger::WPAD_Stick(u8 right, int axis)
#endif #endif
} }
s8 GuiTrigger::WPAD_StickX(u8 stick)
{
return WPAD_Stick(stick, 0);
}
s8 GuiTrigger::WPAD_StickY(u8 stick)
{
return WPAD_Stick(stick, 1);
}
bool GuiTrigger::Left() bool GuiTrigger::Left()
{ {
u32 wiibtn = GCSettings.WiimoteOrientation ? WPAD_BUTTON_UP : WPAD_BUTTON_LEFT; u32 wiibtn = GCSettings.WiimoteOrientation ? WPAD_BUTTON_UP : WPAD_BUTTON_LEFT;

154
source/ngc/pad.cpp
View File

@ -235,7 +235,6 @@ SetupPads()
} }
#ifdef HW_RVL #ifdef HW_RVL
/**************************************************************************** /****************************************************************************
* ShutoffRumble * ShutoffRumble
***************************************************************************/ ***************************************************************************/
@ -273,149 +272,69 @@ void DoRumble(int i)
WPAD_Rumble(i, 0); // rumble off WPAD_Rumble(i, 0); // rumble off
} }
} }
s8 WPAD_StickX(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 * sin((PI * ang)/180.0f);
return (s8)(val * 128.0f);
}
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);
}
#endif #endif
// hold zapper cursor positions // hold zapper cursor positions
static int pos_x = 0; static int pos_x = 0;
static int pos_y = 0; static int pos_y = 0;
static void UpdateCursorPosition (int pad) static void UpdateCursorPosition (int chan)
{ {
#define ZAPPERPADCAL 20 #define ZAPPERPADCAL 20
// gc left joystick // gc left joystick
signed char pad_x = PAD_StickX (pad);
signed char pad_y = PAD_StickY (pad);
if (pad_x > ZAPPERPADCAL){ if (userInput[chan].pad.stickX > ZAPPERPADCAL)
pos_x += (pad_x*1.0)/ZAPPERPADCAL; {
pos_x += (userInput[chan].pad.stickX*1.0)/ZAPPERPADCAL;
if (pos_x > 256) pos_x = 256; if (pos_x > 256) pos_x = 256;
} }
if (pad_x < -ZAPPERPADCAL){ if (userInput[chan].pad.stickX < -ZAPPERPADCAL)
pos_x -= (pad_x*-1.0)/ZAPPERPADCAL; {
pos_x -= (userInput[chan].pad.stickX*-1.0)/ZAPPERPADCAL;
if (pos_x < 0) pos_x = 0; if (pos_x < 0) pos_x = 0;
} }
if (pad_y < -ZAPPERPADCAL){ if (userInput[chan].pad.stickY < -ZAPPERPADCAL)
pos_y += (pad_y*-1.0)/ZAPPERPADCAL; {
pos_y += (userInput[chan].pad.stickY*-1.0)/ZAPPERPADCAL;
if (pos_y > 224) pos_y = 224; if (pos_y > 224) pos_y = 224;
} }
if (pad_y > ZAPPERPADCAL){ if (userInput[chan].pad.stickY > ZAPPERPADCAL)
pos_y -= (pad_y*1.0)/ZAPPERPADCAL; {
pos_y -= (userInput[chan].pad.stickY*1.0)/ZAPPERPADCAL;
if (pos_y < 0) pos_y = 0; if (pos_y < 0) pos_y = 0;
} }
#ifdef HW_RVL #ifdef HW_RVL
struct ir_t ir; // wiimote ir if (userInput[chan].wpad->ir.valid)
WPAD_IR(pad, &ir);
if (ir.valid)
{ {
pos_x = (ir.x * 256) / 640; pos_x = (userInput[chan].wpad->ir.x * 256) / 640;
pos_y = (ir.y * 224) / 480; pos_y = (userInput[chan].wpad->ir.y * 224) / 480;
} }
else else
{ {
signed char wm_ax = WPAD_StickX (pad, 0); s8 wm_ax = userInput[chan].WPAD_StickX(0);
signed char wm_ay = WPAD_StickY (pad, 0); s8 wm_ay = userInput[chan].WPAD_StickY(0);
if (wm_ax > ZAPPERPADCAL){ if (wm_ax > ZAPPERPADCAL)
{
pos_x += (wm_ax*1.0)/ZAPPERPADCAL; pos_x += (wm_ax*1.0)/ZAPPERPADCAL;
if (pos_x > 256) pos_x = 256; if (pos_x > 256) pos_x = 256;
} }
if (wm_ax < -ZAPPERPADCAL){ if (wm_ax < -ZAPPERPADCAL)
{
pos_x -= (wm_ax*-1.0)/ZAPPERPADCAL; pos_x -= (wm_ax*-1.0)/ZAPPERPADCAL;
if (pos_x < 0) pos_x = 0; if (pos_x < 0) pos_x = 0;
} }
if (wm_ay < -ZAPPERPADCAL){ if (wm_ay < -ZAPPERPADCAL)
{
pos_y += (wm_ay*-1.0)/ZAPPERPADCAL; pos_y += (wm_ay*-1.0)/ZAPPERPADCAL;
if (pos_y > 224) pos_y = 224; if (pos_y > 224) pos_y = 224;
} }
if (wm_ay > ZAPPERPADCAL){ if (wm_ay > ZAPPERPADCAL)
{
pos_y -= (wm_ay*1.0)/ZAPPERPADCAL; pos_y -= (wm_ay*1.0)/ZAPPERPADCAL;
if (pos_y < 0) pos_y = 0; if (pos_y < 0) pos_y = 0;
} }
@ -429,23 +348,20 @@ static void UpdateCursorPosition (int pad)
extern int rapidAlternator; extern int rapidAlternator;
static unsigned char DecodeJoy( unsigned short pad ) static unsigned char DecodeJoy(unsigned short chan)
{ {
signed char pad_x = PAD_StickX (pad); s8 pad_x = userInput[chan].pad.stickX;
signed char pad_y = PAD_StickY (pad); s8 pad_y = userInput[chan].pad.stickY;
u32 jp = PAD_ButtonsHeld (pad); u32 jp = userInput[chan].pad.btns_h;
unsigned char J = 0; unsigned char J = 0;
#ifdef HW_RVL #ifdef HW_RVL
signed char wm_ax = 0; s8 wm_ax = userInput[0].WPAD_StickX(0);
signed char wm_ay = 0; s8 wm_ay = userInput[0].WPAD_StickY(0);
u32 wp = 0; u32 wp = userInput[0].wpad->btns_h;
wm_ax = WPAD_StickX ((u8)pad, 0);
wm_ay = WPAD_StickY ((u8)pad, 0);
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(chan, &exp_type) != 0 ) exp_type = WPAD_EXP_NONE;
#endif #endif
/*** /***
@ -646,7 +562,7 @@ void GetJoy()
// Turbo mode // Turbo mode
// RIGHT on c-stick and on classic ctrlr right joystick // RIGHT on c-stick and on classic ctrlr right joystick
if(userInput[0].pad.substickX > 70 || userInput[0].WPAD_Stick(1,0) > 70) if(userInput[0].pad.substickX > 70 || userInput[0].WPAD_StickX(1) > 70)
turbomode = 1; turbomode = 1;
else else
turbomode = 0; turbomode = 0;

3
source/ngc/pad.h
View File

@ -28,10 +28,7 @@ void SetControllers();
void ResetControls(int cc = -1, int wc = -1); void ResetControls(int cc = -1, int wc = -1);
void ShutoffRumble(); void ShutoffRumble();
void DoRumble(int i); void DoRumble(int i);
s8 WPAD_StickX(u8 chan,u8 right);
s8 WPAD_StickY(u8 chan, u8 right);
void GetJoy(); void GetJoy();
void DrawCursor();
bool MenuRequested(); bool MenuRequested();
void SetupPads(); void SetupPads();
void UpdatePads(); void UpdatePads();