libretro/beetle-wswan-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-wswan-libretro.git synced 2024-11-27 10:10:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #37 from retro-wertz/joypad_rotation

Browse Source 
Joypad rotation as a separate core option
This commit is contained in:
Twinaphex 2019-01-31 01:51:50 +01:00 committed by GitHub
commit ecada6655c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -562,7 +562,6 @@ else
endif
$(TARGET): $(OBJECTS)
@echo "** BUILDING $(TARGET) FOR PLATFORM $(platform) **"
ifeq ($(platform), emscripten)
$(CXX) $(CXXFLAGS) $(OBJOUT)$@ $^
else ifeq ($(STATIC_LINKING), 1)
@ -570,7 +569,6 @@ else ifeq ($(STATIC_LINKING), 1)
else
$(LD) $(LINKOUT)$@ $^ $(LDFLAGS) $(LIBS)
endif
@echo "** BUILD SUCCESSFUL! GG NO RE **"
%.o: %.cpp
$(CXX) -c $(OBJOUT)$@ $< $(CPPFLAGS) $(CXXFLAGS)

41
libretro.cpp
View File

@ -24,6 +24,8 @@ static double last_sound_rate;
static bool rotate_tall;
static bool select_pressed_last_frame;
static unsigned rotate_joymap;
static MDFN_Surface *surf;
/* Cygne
@ -549,6 +551,18 @@ static void check_variables(void)
{
struct retro_variable var = {0};
var.key = "wswan_rotate_keymap",
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
if (!strcmp(var.value, "disabled"))
rotate_joymap = 0;
else if (!strcmp(var.value, "enabled"))
rotate_joymap = 1;
else if (!strcmp(var.value, "auto"))
rotate_joymap = 2;
}
}
#define MAX_PLAYERS 1
@ -609,6 +623,7 @@ bool retro_load_game(const struct retro_game_info *info)
rotate_tall = false;
select_pressed_last_frame = false;
rotate_joymap = 0;
check_variables();
@ -683,21 +698,12 @@ static void update_input(void)
select_pressed_last_frame = select_button;
if(rotate_tall)
{
//upright rotation
for (unsigned i = 0; i < MAX_BUTTONS; i++)
input_buf |= map[1][i] != -1u &&
input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, map[1][i]) ? (1 << i) : 0;
}
else
{
//normal rotation
for (unsigned i = 0; i < MAX_BUTTONS; i++)
input_buf |= map[0][i] != -1u &&
input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, map[0][i]) ? (1 << i) : 0;
}
bool joymap = (rotate_joymap == 2) ? rotate_tall : (rotate_joymap ? true : false);
for (unsigned i = 0; i < MAX_BUTTONS; i++) {
input_buf |= map[joymap][i] != -1u &&
input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, map[joymap][i]) ? (1 << i) : 0;
}
#ifdef MSB_FIRST
union {
@ -821,6 +827,13 @@ void retro_set_controller_port_device(unsigned in_port, unsigned device)
void retro_set_environment(retro_environment_t cb)
{
environ_cb = cb;
struct retro_variable variables[] = {
{ "wswan_rotate_keymap", "Rotate button mappings; auto|disabled|enabled" },
{ NULL, NULL },
};
cb(RETRO_ENVIRONMENT_SET_VARIABLES, variables);
}
void retro_set_audio_sample(retro_audio_sample_t cb)