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

[Libretro] fix some input issues due to more recent api changes

This commit is contained in:
CasualPokePlayer 2022-05-05 02:46:13 -07:00
parent 25fb816988
commit b72590066f
5 changed files with 63 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/libLibretroBridge.dll
View File

Binary file not shown.

BIN
Assets/dll/libLibretroBridge.so
View File

Binary file not shown.

8
LibretroBridge/LibretroBridge.cpp
View File

@ -42,7 +42,6 @@ public:
std::memset(lightGun, 0, sizeof (lightGun)); std::memset(lightGun, 0, sizeof (lightGun));
std::memset(analog, 0, sizeof (analog)); std::memset(analog, 0, sizeof (analog));
std::memset(pointer, 0, sizeof (pointer)); std::memset(pointer, 0, sizeof (pointer));
std::memset(sensorAccelerometer, 0, sizeof (sensorAccelerometer));
} }
static void RetroLog(RETRO_LOG level, const char* fmt, ...) { static void RetroLog(RETRO_LOG level, const char* fmt, ...) {
@ -443,9 +442,6 @@ public:
case RETRO_DEVICE::POINTER: case RETRO_DEVICE::POINTER:
assert(id < sizeof (pointer)); assert(id < sizeof (pointer));
return pointer[id]; return pointer[id];
case RETRO_DEVICE::SENSOR_ACCELEROMETER:
assert(id < sizeof (sensorAccelerometer));
return sensorAccelerometer[id];
default: default:
__builtin_unreachable(); __builtin_unreachable();
} }
@ -519,9 +515,6 @@ public:
case RETRO_DEVICE::POINTER: case RETRO_DEVICE::POINTER:
std::memcpy(pointer, input, sizeof (pointer)); std::memcpy(pointer, input, sizeof (pointer));
break; break;
case RETRO_DEVICE::SENSOR_ACCELEROMETER:
std::memcpy(sensorAccelerometer, input, sizeof (sensorAccelerometer));
break;
default: default:
__builtin_unreachable(); __builtin_unreachable();
} }
@ -565,7 +558,6 @@ private:
s16 lightGun[static_cast<u32>(RETRO_DEVICE_ID_LIGHTGUN::LAST)]; s16 lightGun[static_cast<u32>(RETRO_DEVICE_ID_LIGHTGUN::LAST)];
s16 analog[static_cast<u32>(RETRO_DEVICE_ID_ANALOG::LAST)]; s16 analog[static_cast<u32>(RETRO_DEVICE_ID_ANALOG::LAST)];
s16 pointer[static_cast<u32>(RETRO_DEVICE_ID_POINTER::LAST)]; s16 pointer[static_cast<u32>(RETRO_DEVICE_ID_POINTER::LAST)];
s16 sensorAccelerometer[static_cast<u32>(RETRO_DEVICE_ID_SENSOR_ACCELEROMETER::LAST)];
}; };
static CallbackHandler * gCbHandler = nullptr; static CallbackHandler * gCbHandler = nullptr;

40
LibretroBridge/LibretroBridge.h
View File

@ -69,7 +69,6 @@ enum class RETRO_DEVICE {
LIGHTGUN = 4, LIGHTGUN = 4,
ANALOG = 5, ANALOG = 5,
POINTER = 6, POINTER = 6,
SENSOR_ACCELEROMETER = 7,
LAST, LAST,
}; };
@ -77,6 +76,7 @@ enum class RETRO_DEVICE {
enum class RETRO_DEVICE_ID_ANALOG { enum class RETRO_DEVICE_ID_ANALOG {
X = 0, X = 0,
Y = 1, Y = 1,
BUTTON = 2,
LAST, LAST,
}; };
@ -86,6 +86,13 @@ enum class RETRO_DEVICE_ID_MOUSE {
Y = 1, Y = 1,
LEFT = 2, LEFT = 2,
RIGHT = 3, RIGHT = 3,
WHEELUP = 4,
WHEELDOWN = 5,
MIDDLE = 6,
HORIZ_WHEELUP = 7,
HORIZ_WHEELDOWN = 8,
BUTTON_4 = 9,
BUTTON_5 = 10,
LAST, LAST,
}; };
@ -98,6 +105,16 @@ enum class RETRO_DEVICE_ID_LIGHTGUN {
TURBO = 4, TURBO = 4,
PAUSE = 5, PAUSE = 5,
START = 6, START = 6,
SELECT = 7,
AUX_C = 8,
DPAD_UP = 9,
DPAD_DOWN = 10,
DPAD_LEFT = 11,
DPAD_RIGHT = 12,
SCREEN_X = 13,
SCREEN_Y = 14,
IS_OFFSCREEN = 15,
RELOAD = 16,
LAST, LAST,
}; };
@ -106,6 +123,7 @@ enum class RETRO_DEVICE_ID_POINTER {
X = 0, X = 0,
Y = 1, Y = 1,
PRESSED = 2, PRESSED = 2,
COUNT = 3,
LAST, LAST,
}; };
@ -268,14 +286,6 @@ enum class RETRO_MOD {
SCROLLLOCK = 64, SCROLLLOCK = 64,
}; };
enum class RETRO_DEVICE_ID_SENSOR_ACCELEROMETER {
X = 0,
Y = 1,
Z = 2,
LAST,
};
enum class RETRO_DEVICE_ID_JOYPAD { enum class RETRO_DEVICE_ID_JOYPAD {
B = 0, B = 0,
Y = 1, Y = 1,
@ -297,6 +307,18 @@ enum class RETRO_DEVICE_ID_JOYPAD {
LAST, LAST,
}; };
enum class RETRO_SENSOR {
ACCELEROMETER_X = 0,
ACCELEROMETER_Y = 1,
ACCELEROMETER_Z = 2,
GYROSCOPE_X = 3,
GYROSCOPE_Y = 4,
GYROSCOPE_Z = 5,
ILLUMINANCE = 6,
LAST,
};
enum class RETRO_PIXEL_FORMAT { enum class RETRO_PIXEL_FORMAT {
ZRGB1555 = 0, ZRGB1555 = 0,
XRGB8888 = 1, XRGB8888 = 1,

42
src/BizHawk.Emulation.Cores/Libretro/Libretro.Api.cs
View File

@ -18,7 +18,6 @@ namespace BizHawk.Emulation.Cores.Libretro
LIGHTGUN = 4, LIGHTGUN = 4,
ANALOG = 5, ANALOG = 5,
POINTER = 6, POINTER = 6,
SENSOR_ACCELEROMETER = 7,
LAST, LAST,
} }
@ -28,6 +27,7 @@ namespace BizHawk.Emulation.Cores.Libretro
// LEFT / RIGHT? // LEFT / RIGHT?
X = 0, X = 0,
Y = 1, Y = 1,
BUTTON = 2,
LAST, LAST,
} }
@ -38,6 +38,13 @@ namespace BizHawk.Emulation.Cores.Libretro
Y = 1, Y = 1,
LEFT = 2, LEFT = 2,
RIGHT = 3, RIGHT = 3,
WHEELUP = 4,
WHEELDOWN = 5,
MIDDLE = 6,
HORIZ_WHEELUP = 7,
HORIZ_WHEELDOWN = 8,
BUTTON_4 = 9,
BUTTON_5 = 10,
LAST, LAST,
} }
@ -51,6 +58,16 @@ namespace BizHawk.Emulation.Cores.Libretro
TURBO = 4, TURBO = 4,
PAUSE = 5, PAUSE = 5,
START = 6, START = 6,
SELECT = 7,
AUX_C = 8,
DPAD_UP = 9,
DPAD_DOWN = 10,
DPAD_LEFT = 11,
DPAD_RIGHT = 12,
SCREEN_X = 13,
SCREEN_Y = 14,
IS_OFFSCREEN = 15,
RELOAD = 16,
LAST, LAST,
} }
@ -60,6 +77,7 @@ namespace BizHawk.Emulation.Cores.Libretro
X = 0, X = 0,
Y = 1, Y = 1,
PRESSED = 2, PRESSED = 2,
COUNT = 3,
LAST, LAST,
} }
@ -225,15 +243,6 @@ namespace BizHawk.Emulation.Cores.Libretro
SCROLLLOCK = 64, SCROLLLOCK = 64,
} }
public enum RETRO_DEVICE_ID_SENSOR_ACCELEROMETER
{
X = 0,
Y = 1,
Z = 2,
LAST,
}
public enum RETRO_DEVICE_ID_JOYPAD public enum RETRO_DEVICE_ID_JOYPAD
{ {
B = 0, B = 0,
@ -256,6 +265,19 @@ namespace BizHawk.Emulation.Cores.Libretro
LAST, LAST,
} }
public enum RETRO_SENSOR
{
ACCELEROMETER_X = 0,
ACCELEROMETER_Y = 1,
ACCELEROMETER_Z = 2,
GYROSCOPE_X = 3,
GYROSCOPE_Y = 4,
GYROSCOPE_Z = 5,
ILLUMINANCE = 6,
LAST,
}
public enum RETRO_REGION : uint public enum RETRO_REGION : uint
{ {
NTSC = 0, NTSC = 0,