maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
Henrique 2021-07-07 17:11:56 -03:00
parent daee309ad8
commit 55cf2896a2
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Sources/armory/logicnode/RemoveInputMapKeyNode.hx
View file

@ -15,7 +15,7 @@ class RemoveInputMapKeyNode extends LogicNode {
var k = InputMap.getInputMapKey(inputMap, key);
if (k != null) {
if (InputMap.getInputMap(inputMap).removeInput(k)) {
if (InputMap.getInputMap(inputMap).removeKey(k)) {
runOutput(0);
}
}

1
Sources/armory/logicnode/SetInputMapKeyNode.hx
View file

@ -36,7 +36,6 @@ class SetInputMapKeyNode extends LogicNode {
}
} else {
k.key = key;
k.scale = scale;
k.deadzone = deadzone;
k.setIndex(index);

26
Sources/armory/system/InputMap.hx
View file

@ -7,7 +7,7 @@ class InputMap {
static var inputMaps = new Map<String, InputMap>();
public var inputs(default, null) = new Array<InputMapKey>();
public var keys(default, null) = new Array<InputMapKey>();
public var lastKeyPressed(default, null) = "";
public function new() {}
@ -26,7 +26,7 @@ class InputMap {
public static function getInputMapKey(inputMap: String, key: String): Null<InputMapKey> {
if (inputMaps.exists(inputMap)) {
for (i in inputMaps[inputMap].inputs) {
for (i in inputMaps[inputMap].keys) {
if (i.key == key) {
return i;
}
@ -37,30 +37,30 @@ class InputMap {
}
public function addKeyboard(key: String, scale: FastFloat = 1.0): InputMapKey {
return addInput(new KeyboardKey(key, scale));
return addKey(new KeyboardKey(key, scale));
}
public function addMouse(key: String, scale: FastFloat = 1.0, deadzone: FastFloat = 0.0): InputMapKey {
return addInput(new MouseKey(key, scale, deadzone));
return addKey(new MouseKey(key, scale, deadzone));
}
public function addGamepad(key: String, scale: FastFloat = 1.0, deadzone: FastFloat = 0.0): InputMapKey {
return addInput(new GamepadKey(key, scale, deadzone));
return addKey(new GamepadKey(key, scale, deadzone));
}
public function addInput(input: InputMapKey): InputMapKey {
inputs.push(input);
return input;
public function addKey(key: InputMapKey): InputMapKey {
keys.push(key);
return key;
}
public function removeInput(input: InputMapKey): Bool {
return inputs.remove(input);
public function removeKey(key: InputMapKey): Bool {
return keys.remove(key);
}
public function value(): FastFloat {
var v = 0.0;
for (i in inputs) {
for (i in keys) {
v += i.value();
}
@ -68,7 +68,7 @@ class InputMap {
}
public function started() {
for (i in inputs) {
for (i in keys) {
if (i.started()) {
lastKeyPressed = i.key;
return true;
@ -79,7 +79,7 @@ class InputMap {
}
public function released() {
for (i in inputs) {
for (i in keys) {
if (i.released()) {
lastKeyPressed = i.key;
return true;