Skip to content

Commit

Permalink
Changed direction keys to be sent via the keypress queue.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lanceewing
lanceewing committed Apr 10, 2024
1 parent a226900 commit c1c4630
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 21 deletions.
6 changes: 5 additions & 1 deletion core/src/main/java/com/agifans/agile/GameScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,11 @@ else if (heading > -2.7488936) {
getAgileRunner().getVariableData().setVar(Defines.EGODIR, direction);
}
else if (direction != 0) {
userInput.setKey(DIRECTION_TO_KEY_MAP[direction], true);
if (direction != previousDirection) {
userInput.keyDown(DIRECTION_TO_KEY_MAP[direction]);
} else {
userInput.setKey(DIRECTION_TO_KEY_MAP[direction], true);
}
}

previousDirection = direction;
Expand Down
62 changes: 44 additions & 18 deletions core/src/main/java/com/agifans/agile/Interpreter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ private void processUserInput() {

// Handle arrow keys.
if (state.userControl) {
// To handle the hold key mode, it needs to check the current key state rather
// than the keypress queue.
if (state.holdKey) {
// In "hold key" mode, the ego direction directly reflects the direction key currently being held down.
byte direction = 0;
Expand All @@ -351,29 +353,31 @@ private void processUserInput() {
if (userInput.keys((int)Keys.HOME)) direction = 8;
state.setVar(Defines.EGODIR, direction);
}
else {
// Whereas in "release key" mode, the direction key press will toggle movement in that direction.
byte direction = 0;
if (userInput.keys((int)Keys.UP) && !userInput.oldKeys((int)Keys.UP)) direction = 1;
if (userInput.keys((int)Keys.PAGE_UP) && !userInput.oldKeys((int)Keys.PAGE_UP)) direction = 2;
if (userInput.keys((int)Keys.RIGHT) && !userInput.oldKeys((int)Keys.RIGHT)) direction = 3;
if (userInput.keys((int)Keys.PAGE_DOWN) && !userInput.oldKeys((int)Keys.PAGE_DOWN)) direction = 4;
if (userInput.keys((int)Keys.DOWN) && !userInput.oldKeys((int)Keys.DOWN)) direction = 5;
if (userInput.keys((int)Keys.END) && !userInput.oldKeys((int)Keys.END)) direction = 6;
if (userInput.keys((int)Keys.LEFT) && !userInput.oldKeys((int)Keys.LEFT)) direction = 7;
if (userInput.keys((int)Keys.HOME) && !userInput.oldKeys((int)Keys.HOME)) direction = 8;
if (direction > 0) {
state.setVar(Defines.EGODIR, (state.getVar(Defines.EGODIR) == direction ? (byte)0 : direction));
}
}
}

// Check all waiting characters.
int ch;
while ((ch = userInput.getKey()) > 0) {

// Check controller matches. They take precedence.
if (state.keyToControllerMap.containsKey(ch)) {
// Direction keys are checked first
if (isDirectionKey(ch) && state.userControl && !state.holdKey) {
byte direction = 0;
if ((ch == (int)Keys.UP) || (ch == (int)Keys.NUMPAD_8)) direction = 1;
if ((ch == (int)Keys.PAGE_UP) || (ch == (int)Keys.NUMPAD_9)) direction = 2;
if ((ch == (int)Keys.RIGHT) || (ch == (int)Keys.NUMPAD_6)) direction = 3;
if ((ch == (int)Keys.PAGE_DOWN) || (ch == (int)Keys.NUMPAD_3)) direction = 4;
if ((ch == (int)Keys.DOWN) || (ch == (int)Keys.NUMPAD_2)) direction = 5;
if ((ch == (int)Keys.END) || (ch == (int)Keys.NUMPAD_1)) direction = 6;
if ((ch == (int)Keys.LEFT) || (ch == (int)Keys.NUMPAD_4)) direction = 7;
if ((ch == (int)Keys.HOME) || (ch == (int)Keys.NUMPAD_7)) direction = 8;
if (direction > 0) {
state.setVar(Defines.EGODIR, (state.getVar(Defines.EGODIR) == direction ? (byte)0 : direction));
}
else if (ch == (int)Keys.NUMPAD_5) {
state.setVar(Defines.EGODIR, 0);
}
}
// Then check controller matches. They take precedence.
else if (state.keyToControllerMap.containsKey(ch)) {
state.controllers[state.keyToControllerMap.get(ch)] = true;
}
else if ((ch & 0xF0000) == UserInput.ASCII) { // Standard char from a keypress event.
Expand Down Expand Up @@ -409,4 +413,26 @@ else if ((ch & 0xF0000) == UserInput.ASCII) { // Standard char from a keypress
}
}
}

private boolean isDirectionKey(int ch) {
return ((ch == (int)Keys.UP) ||
(ch == (int)Keys.PAGE_UP) ||
(ch == (int)Keys.RIGHT) ||
(ch == (int)Keys.PAGE_DOWN) ||
(ch == (int)Keys.DOWN) ||
(ch == (int)Keys.END)||
(ch == (int)Keys.LEFT)||
(ch == (int)Keys.HOME) ||
// Number pad direction keys
(ch == (int)Keys.NUMPAD_1) ||
(ch == (int)Keys.NUMPAD_2) ||
(ch == (int)Keys.NUMPAD_3) ||
(ch == (int)Keys.NUMPAD_4) ||
(ch == (int)Keys.NUMPAD_5) ||
(ch == (int)Keys.NUMPAD_6) ||
(ch == (int)Keys.NUMPAD_7) ||
(ch == (int)Keys.NUMPAD_8) ||
(ch == (int)Keys.NUMPAD_9)
);
}
}
14 changes: 12 additions & 2 deletions core/src/main/java/com/agifans/agile/UserInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,17 @@ public abstract class UserInput extends InputAdapter {
Keys.PAGE_DOWN,
Keys.HOME,
Keys.INSERT,
Keys.DEL);
Keys.DEL,
Keys.NUMPAD_1,
Keys.NUMPAD_2,
Keys.NUMPAD_3,
Keys.NUMPAD_4,
Keys.NUMPAD_5,
Keys.NUMPAD_6,
Keys.NUMPAD_7,
Keys.NUMPAD_8,
Keys.NUMPAD_9
);

/**
* Constructor for UserInput.
Expand Down Expand Up @@ -102,7 +112,7 @@ public void setGameScreen(GameScreen gameScreen) {
*
* @return whether the input was processed
*/
public boolean keyDown (int keycode) {
public boolean keyDown(int keycode) {
// For now, we're interpreting back as request to Quit.
if (keycode == Keys.BACK) {
keyPressQueueAdd(ALT_MODIFIER | Keys.Z);
Expand Down

0 comments on commit c1c4630

Please sign in to comment.