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

Reworked many things relating to joypad_set. New logic, removed a few functions, all that stuff. Hopefully a few bug fixes with no new bugs on the way. Haven't put in the invert that I like, but hopefully that isn't hard to put in.

This commit is contained in:
fatratknight 2009-09-15 16:39:49 +00:00
parent 23a190acd2
commit 0bea4a45d8
4 changed files with 44 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -1,3 +1,4 @@
15-september-2009 - FatRatKnight - Reworked how input is taken from lua, and generally everything related to joypad.set and what it affects. Now setting stuff to false will: Prevent user control for exactly one frame, and allow more than one false button as a time. Yeah, bug fixes. Hopefully runs a little faster now.
22-august-2009 - adelikat - Win32 - Map Hotkeys Dialog - Fixed but where "X" and Alt+F4 would not close dialog
22-august-2009 - adelikat - Win32 - Added a Save Config File menu item
12-august-2009 - adelikat - Win32 - Added a menu item to toggle to New PPU

4
src/fceulua.h
View File

@ -10,9 +10,7 @@ void FCEU_ReloadLuaCode();
void FCEU_LuaStop();
int FCEU_LuaRunning();
int FCEU_LuaUsingJoypad(int);
uint8 FCEU_LuaReadJoypad(int);
uint8 FCEU_LuaReadJoypadFalse(int which); //adelikat - will be used to generate a 3rd button condition - false (in addition to true & nil)
uint8 FCEU_LuaReadJoypad(int,uint8); // HACK - Function needs controller input
int FCEU_LuaSpeed();
int FCEU_LuaFrameskip();
int FCEU_LuaRerecordCountSkip();

26
src/input.cpp
View File

@ -192,16 +192,12 @@ static uint8 ReadGPVS(int w)
static void UpdateGP(int w, void *data, int arg)
{
if(w==0) //adelikat, 3/14/09: Changing the joypads to inclusive OR the user's joypad + the Lua joypad, this way lua only takes over the buttons it explicity says to
{
{ //FatRatKnight: Assume lua is always good. If it's doing nothing in particular using my logic, it'll pass-through the values anyway.
#ifdef _S9XLUA_H
//joy[0]= FCEU_LuaUsingJoypad(0) ? FCEU_LuaReadJoypad(0) : *(uint32 *)joyports[0].ptr;
joy[0]= FCEU_LuaUsingJoypad(0) ? (FCEU_LuaReadJoypad(0) | (*(uint32 *)joyports[0].ptr)) : *(uint32 *)joyports[0].ptr;
if (FCEU_LuaReadJoypadFalse(0))
joy[0] &= FCEU_LuaReadJoypadFalse(0);
//joy[2]= FCEU_LuaUsingJoypad(2) ? FCEU_LuaReadJoypad(2) : *(uint32 *)joyports[0].ptr >> 16;
joy[2]= FCEU_LuaUsingJoypad(2) ? (FCEU_LuaReadJoypad(2) | (*(uint32 *)joyports[0].ptr >> 16)) : *(uint32 *)joyports[0].ptr >> 16;
if (FCEU_LuaReadJoypadFalse(2))
joy[2] &= FCEU_LuaReadJoypadFalse(2);
joy[0]= *(uint32 *)joyports[0].ptr;
joy[0]= FCEU_LuaReadJoypad(0,joy[0]);
joy[2]= *(uint32 *)joyports[0].ptr >> 16;
joy[2]= FCEU_LuaReadJoypad(2,joy[2]);
#else // without this, there seems to be no input at all without Lua
joy[0] = *(uint32 *)joyports[0].ptr;;
joy[2] = *(uint32 *)joyports[0].ptr >> 16;
@ -210,14 +206,10 @@ static void UpdateGP(int w, void *data, int arg)
else
{
#ifdef _S9XLUA_H
//joy[1]= FCEU_LuaUsingJoypad(1) ? FCEU_LuaReadJoypad(1) : *(uint32 *)joyports[1].ptr >> 8;
joy[1]= FCEU_LuaUsingJoypad(1) ? (FCEU_LuaReadJoypad(1) | (*(uint32 *)joyports[1].ptr >> 8)) : *(uint32 *)joyports[1].ptr >> 8;
if (FCEU_LuaReadJoypadFalse(1))
joy[1] &= FCEU_LuaReadJoypadFalse(1);
//joy[3]= FCEU_LuaUsingJoypad(3) ? FCEU_LuaReadJoypad(3) : *(uint32 *)joyports[1].ptr >> 24;
joy[3]= FCEU_LuaUsingJoypad(3) ? (FCEU_LuaReadJoypad(3) | (*(uint32 *)joyports[1].ptr >> 24)) : *(uint32 *)joyports[1].ptr >> 24;
if (FCEU_LuaReadJoypadFalse(3))
joy[3] &= FCEU_LuaReadJoypadFalse(3);
joy[1]= *(uint32 *)joyports[1].ptr >> 8;
joy[1]= FCEU_LuaReadJoypad(1,joy[1]);
joy[3]= *(uint32 *)joyports[1].ptr >> 24;
joy[3]= FCEU_LuaReadJoypad(3,joy[3]);
#else // same goes for the other two pads
joy[1] = *(uint32 *)joyports[1].ptr >> 8;
joy[3] = *(uint32 *)joyports[1].ptr >> 24;

68
src/lua-engine.cpp
View File

@ -111,11 +111,11 @@ static int wasPaused = FALSE;
static int transparency;
// Our joypads.
static uint8 lua_joypads[4];
static uint8 lua_joypads_used;
//adelikat - adding these to generate the condition of false (previously false resulted in the "on" condition)
static uint8 lua_joypads_false[4];
static uint8 lua_joypads_used_false;
static uint8 luajoypads1[4]= { 0xFF, 0xFF, 0xFF, 0xFF }; //x1
static uint8 luajoypads2[4]= { 0x00, 0x00, 0x00, 0x00 }; //0x
/* Crazy logic stuff.
11 - true 01 - pass-through (default)
00 - false 10 - invert */
static enum { GUI_USED_SINCE_LAST_DISPLAY, GUI_USED_SINCE_LAST_FRAME, GUI_CLEAR } gui_used = GUI_CLEAR;
static uint8 *gui_data = NULL;
@ -147,8 +147,10 @@ static const char *button_mappings[] = {
*/
static void FCEU_LuaOnStop() {
luaRunning = FALSE;
lua_joypads_used = 0;
lua_joypads_used_false = 0;
for (int i = 0 ; i < 4 ; i++ ){
luajoypads1[i]= 0xFF; // Set these back to pass-through
luajoypads2[i]= 0x00;
}
gui_used = GUI_CLEAR;
if (wasPaused && !FCEUI_EmulationPaused())
FCEUI_ToggleEmulationPause();
@ -706,9 +708,8 @@ static int joypad_read(lua_State *L) {
// Sets the given buttons to be pressed during the next
// frame advance. The table should have the right
// keys (no pun intended) set.
/*FatRatKnight: Attempted a fix of joypad_set
Lines changed marked by comments
Lines that were once in place are commented out*/
/*FatRatKnight: I changed some of the logic.
*/
static int joypad_set(lua_State *L) {
// Which joypad we're tampering with
@ -722,11 +723,8 @@ static int joypad_set(lua_State *L) {
luaL_checktype(L,2,LUA_TTABLE);
// Set up for taking control of the indicated controller
lua_joypads_used |= 1 << (which-1);
lua_joypads[which-1] = 0;
lua_joypads_used_false |= 1 << (which -1);
/**/lua_joypads_false[which-1] = 0xFF; /*lua_joypads[which-1] = 0;*/
luajoypads1[which-1] = 0xFF; // .1 Reset right bit
luajoypads2[which-1] = 0x00; // 0. Reset left bit
int i;
for (i=0; i < 8; i++) {
@ -736,16 +734,12 @@ static int joypad_set(lua_State *L) {
if (!lua_isnil(L,-1))
{
if (lua_toboolean(L,-1)) //True
lua_joypads[which-1] |= 1 << i;
luajoypads2[which-1] |= 1 << i;
else //False
{
/**/ lua_joypads_false[which-1] &= 0xFF - (1 << i); //Create a false joypad to overlay on the regular input, 0's will result in turning off and overriding the input
//1's will mean it does not take control
/* lua_joypads_false[which-1] = 1 << i;
lua_joypads_false[which-1] = ~lua_joypads_false[which-1];*/
//if (lua_toboolean == 0 || 'string is "invert"'
luajoypads1[which-1] &= ~(1 << i);
}
}
//Button is nil, so leave that button blank
else
{
@ -2213,9 +2207,9 @@ int FCEU_LuaRunning() {
/**
* Returns true if Lua would like to steal the given joypad control.
*/
int FCEU_LuaUsingJoypad(int which) {
return lua_joypads_used & (1 << which);
}
//int FCEU_LuaUsingJoypad(int which) {
// return lua_joypads_used & (1 << which);
//}
//adelikat: TODO: should I have a FCEU_LuaUsingJoypadFalse?
@ -2223,20 +2217,24 @@ int FCEU_LuaUsingJoypad(int which) {
* Reads the buttons Lua is feeding for the given joypad, in the same
* format as the OS-specific code.
*
* This function must not be called more than once per frame. Ideally exactly once
* per frame (if FCEU_LuaUsingJoypad says it's safe to do so)
* It may force set or force clear the buttons. It may also simply
* pass the input along or invert it. The act of calling this
* function will reset everything back to pass-through, though.
* Generally means don't call it more than once per frame!
*/
uint8 FCEU_LuaReadJoypad(int which) {
lua_joypads_used &= ~(1 << which);
return lua_joypads[which];
uint8 FCEU_LuaReadJoypad(int which, uint8 joyl) {
joyl = (joyl & luajoypads1[which]) | (~joyl & luajoypads2[which]);
luajoypads1[which] = 0xFF;
luajoypads2[which] = 0x00;
return joyl;
}
//adelikat: Returns the buttons that will be specifically set to false (as opposed to on or nil)
//This will be used in input.cpp to &(and) against the input to override a button with a false value. This is a work around to allow 3 conditions to be sent be lua, true, false, nil
uint8 FCEU_LuaReadJoypadFalse(int which) {
lua_joypads_used_false &= ~(1 << which);
return lua_joypads_false[which];
}
//uint8 FCEU_LuaReadJoypadFalse(int which) {
// lua_joypads_used_false &= ~(1 << which);
// return lua_joypads_false[which];
//}
/**
* If this function returns true, the movie code should NOT increment