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

SDL: Axis mapping loading

This commit is contained in:
Jeffrey Pfau 2014-12-14 00:27:57 -08:00
parent 9b74e27d7a
commit 0aea272583
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/gba/gba-input.c
View File

@ -67,6 +67,7 @@ static struct GBAInputMapImpl* _guaranteeMap(struct GBAInputMap* map, uint32_t t
impl = &map->maps[0]; impl = &map->maps[0];
impl->type = type; impl->type = type;
impl->map = calloc(GBA_KEY_MAX, sizeof(enum GBAKey)); impl->map = calloc(GBA_KEY_MAX, sizeof(enum GBAKey));
TableInit(&impl->axes, 2, free);
} else { } else {
impl = _lookupMap(map, type); impl = _lookupMap(map, type);
} }
@ -92,8 +93,8 @@ static struct GBAInputMapImpl* _guaranteeMap(struct GBAInputMap* map, uint32_t t
impl->type = type; impl->type = type;
impl->map = calloc(GBA_KEY_MAX, sizeof(enum GBAKey)); impl->map = calloc(GBA_KEY_MAX, sizeof(enum GBAKey));
} }
TableInit(&impl->axes, 2, free);
} }
TableInit(&impl->axes, 2, free);
return impl; return impl;
} }
@ -129,23 +130,27 @@ static void _loadAxis(struct GBAInputMap* map, uint32_t type, const struct Confi
snprintf(axisKey, KEY_NAME_MAX, "axis%sAxis", axisName); snprintf(axisKey, KEY_NAME_MAX, "axis%sAxis", axisName);
axisKey[KEY_NAME_MAX - 1] = '\0'; axisKey[KEY_NAME_MAX - 1] = '\0';
int axis; int axis;
if (!_getIntValue(config, sectionName, axisKey, &axis)) { const char* strValue = ConfigurationGetValue(config, sectionName, axisKey);
if (!strValue || !strValue[0]) {
return;
}
char* end;
axis = strtoul(&strValue[1], &end, 10);
if (*end) {
return; return;
} }
const struct GBAAxis* description = GBAInputQueryAxis(map, type, axis); const struct GBAAxis* description = GBAInputQueryAxis(map, type, axis);
struct GBAAxis realDescription; struct GBAAxis realDescription = { GBA_KEY_NONE, GBA_KEY_NONE, 0, 0 };
if (!description) { if (description) {
realDescription = (struct GBAAxis) { direction, GBA_KEY_NONE, value, 0 };
} else {
realDescription = *description; realDescription = *description;
if (value >= realDescription.lowDirection) { }
realDescription.deadHigh = value; if (strValue[0] == '+') {
realDescription.highDirection = direction; realDescription.deadHigh = value;
} else if (value <= realDescription.highDirection) { realDescription.highDirection = direction;
realDescription.deadLow = value; } else if (strValue[0] == '-') {
realDescription.lowDirection = direction; realDescription.deadLow = value;
} realDescription.lowDirection = direction;
} }
GBAInputBindAxis(map, type, axis, &realDescription); GBAInputBindAxis(map, type, axis, &realDescription);
} }
@ -300,6 +305,11 @@ void GBAInputMapLoad(struct GBAInputMap* map, uint32_t type, const struct Config
_loadKey(map, type, config, GBA_KEY_DOWN, "Down"); _loadKey(map, type, config, GBA_KEY_DOWN, "Down");
_loadKey(map, type, config, GBA_KEY_LEFT, "Left"); _loadKey(map, type, config, GBA_KEY_LEFT, "Left");
_loadKey(map, type, config, GBA_KEY_RIGHT, "Right"); _loadKey(map, type, config, GBA_KEY_RIGHT, "Right");
_loadAxis(map, type, config, GBA_KEY_UP, "Up");
_loadAxis(map, type, config, GBA_KEY_DOWN, "Down");
_loadAxis(map, type, config, GBA_KEY_LEFT, "Left");
_loadAxis(map, type, config, GBA_KEY_RIGHT, "Right");
} }
void GBAInputMapSave(const struct GBAInputMap* map, uint32_t type, struct Configuration* config) { void GBAInputMapSave(const struct GBAInputMap* map, uint32_t type, struct Configuration* config) {