mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(input_overlay.c) Refactor input_overlay.c to have it use djb2

Browse Source
This commit is contained in:
twinaphex 2015-06-14 16:53:09 +02:00
parent 2ef68cc249
commit 1461386d07
1 changed files with 86 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
input/input_overlay.c
View File

@ -15,16 +15,25 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h>
#include <string.h> #include <string.h>
#include "input_overlay.h" #include <math.h>
#include "../driver.h"
#include <compat/posix_string.h> #include <compat/posix_string.h>
#include "input_common.h"
#include <file/file_path.h> #include <file/file_path.h>
#include <string/string_list.h> #include <string/string_list.h>
#include <clamping.h> #include <clamping.h>
#include <stddef.h> #include <rhash.h>
#include <math.h>
#include "input_overlay.h"
#include "../driver.h"
#include "input_common.h"
#define BOX_RADIAL 0x18df06d2U
#define BOX_RECT 0x7c9d4d93U
#define KEY_ANALOG_LEFT 0x56b92e81U
#define KEY_ANALOG_RIGHT 0x2e4dc654U
/** /**
* input_overlay_scale: * input_overlay_scale:
@ -196,6 +205,7 @@ static bool input_overlay_load_desc(input_overlay_t *ol,
bool normalized, float alpha_mod, float range_mod) bool normalized, float alpha_mod, float range_mod)
{ {
float width_mod, height_mod; float width_mod, height_mod;
uint32_t box_hash, key_hash;
bool ret = true; bool ret = true;
bool by_pixel = false; bool by_pixel = false;
char overlay_desc_key[64] = {0}; char overlay_desc_key[64] = {0};
@ -245,42 +255,52 @@ static bool input_overlay_load_desc(input_overlay_t *ol,
return false; return false;
} }
key = list->elems[0].data;
x = list->elems[1].data; x = list->elems[1].data;
y = list->elems[2].data; y = list->elems[2].data;
box = list->elems[3].data; box = list->elems[3].data;
key = list->elems[0].data; box_hash = djb2_calculate(box);
key_hash = djb2_calculate(key);
desc->key_mask = 0; desc->key_mask = 0;
if (!strcmp(key, "analog_left")) switch (key_hash)
desc->type = OVERLAY_TYPE_ANALOG_LEFT;
else if (!strcmp(key, "analog_right"))
desc->type = OVERLAY_TYPE_ANALOG_RIGHT;
else if (strstr(key, "retrok_") == key)
{ {
desc->type = OVERLAY_TYPE_KEYBOARD; case KEY_ANALOG_LEFT:
desc->key_mask = input_translate_str_to_rk(key + 7); desc->type = OVERLAY_TYPE_ANALOG_LEFT;
} break;
else case KEY_ANALOG_RIGHT:
{ desc->type = OVERLAY_TYPE_ANALOG_RIGHT;
const char *tmp = NULL; break;
default:
if (strstr(key, "retrok_") == key)
{
desc->type = OVERLAY_TYPE_KEYBOARD;
desc->key_mask = input_translate_str_to_rk(key + 7);
}
else
{
const char *tmp = NULL;
desc->type = OVERLAY_TYPE_BUTTONS; desc->type = OVERLAY_TYPE_BUTTONS;
for (tmp = strtok_r(key, "|", &save); tmp; tmp = strtok_r(NULL, "|", &save)) for (tmp = strtok_r(key, "|", &save); tmp; tmp = strtok_r(NULL, "|", &save))
{ {
if (strcmp(tmp, "nul") != 0) if (strcmp(tmp, "nul") != 0)
desc->key_mask |= UINT64_C(1) << input_translate_str_to_bind_id(tmp); desc->key_mask |= UINT64_C(1) << input_translate_str_to_bind_id(tmp);
} }
if (desc->key_mask & (UINT64_C(1) << RARCH_OVERLAY_NEXT)) if (desc->key_mask & (UINT64_C(1) << RARCH_OVERLAY_NEXT))
{ {
char overlay_target_key[64] = {0}; char overlay_target_key[64] = {0};
snprintf(overlay_target_key, sizeof(overlay_target_key), snprintf(overlay_target_key, sizeof(overlay_target_key),
"overlay%u_desc%u_next_target", ol_idx, desc_idx); "overlay%u_desc%u_next_target", ol_idx, desc_idx);
config_get_array(ol->conf, overlay_target_key, config_get_array(ol->conf, overlay_target_key,
desc->next_index_name, sizeof(desc->next_index_name)); desc->next_index_name, sizeof(desc->next_index_name));
} }
}
break;
} }
width_mod = 1.0f; width_mod = 1.0f;
@ -295,35 +315,45 @@ static bool input_overlay_load_desc(input_overlay_t *ol,
desc->x = (float)strtod(x, NULL) * width_mod; desc->x = (float)strtod(x, NULL) * width_mod;
desc->y = (float)strtod(y, NULL) * height_mod; desc->y = (float)strtod(y, NULL) * height_mod;
if (!strcmp(box, "radial")) switch (box_hash)
desc->hitbox = OVERLAY_HITBOX_RADIAL;
else if (!strcmp(box, "rect"))
desc->hitbox = OVERLAY_HITBOX_RECT;
else
{ {
RARCH_ERR("[Overlay]: Hitbox type (%s) is invalid. Use \"radial\" or \"rect\".\n", box); case BOX_RADIAL:
ret = false; desc->hitbox = OVERLAY_HITBOX_RADIAL;
goto end; break;
} case BOX_RECT:
desc->hitbox = OVERLAY_HITBOX_RECT;
if ( break;
desc->type == OVERLAY_TYPE_ANALOG_LEFT || default:
desc->type == OVERLAY_TYPE_ANALOG_RIGHT) RARCH_ERR("[Overlay]: Hitbox type (%s) is invalid. Use \"radial\" or \"rect\".\n", box);
{
char overlay_analog_saturate_key[64] = {0};
if (desc->hitbox != OVERLAY_HITBOX_RADIAL)
{
RARCH_ERR("[Overlay]: Analog hitbox type must be \"radial\".\n");
ret = false; ret = false;
goto end; goto end;
} }
snprintf(overlay_analog_saturate_key, sizeof(overlay_analog_saturate_key), switch (desc->type)
"overlay%u_desc%u_saturate_pct", ol_idx, desc_idx); {
if (!config_get_float(ol->conf, overlay_analog_saturate_key, case OVERLAY_TYPE_ANALOG_LEFT:
&desc->analog_saturate_pct)) case OVERLAY_TYPE_ANALOG_RIGHT:
desc->analog_saturate_pct = 1.0f; {
char overlay_analog_saturate_key[64] = {0};
if (desc->hitbox != OVERLAY_HITBOX_RADIAL)
{
RARCH_ERR("[Overlay]: Analog hitbox type must be \"radial\".\n");
ret = false;
goto end;
}
snprintf(overlay_analog_saturate_key, sizeof(overlay_analog_saturate_key),
"overlay%u_desc%u_saturate_pct", ol_idx, desc_idx);
if (!config_get_float(ol->conf, overlay_analog_saturate_key,
&desc->analog_saturate_pct))
desc->analog_saturate_pct = 1.0f;
}
break;
default:
/* OVERLAY_TYPE_BUTTONS - unhandled */
/* OVERLAY_TYPE_KEYBOARD - unhandled */
break;
} }
desc->range_x = (float)strtod(list->elems[4].data, NULL) * width_mod; desc->range_x = (float)strtod(list->elems[4].data, NULL) * width_mod;