Merge pull request #187 from niente1899/Add-KeyConfig-DeleteKey

Add KeyConfig DeleteKey

src/bms/player/beatoraja/config/KeyConfiguration.java

@@ -98,6 +98,8 @@ public class KeyConfiguration extends MainState {
 	private ControllerConfig[] controllerConfigs;
 	private MidiConfig midiconfig;
 
+	private boolean deletepressed = false;
+
 	public KeyConfiguration(MainController main) {
 		super(main);
 
@@ -162,6 +164,10 @@ public void render() {
 				setMidiKeyAssign(midikeysa[cursorpos]);
 				keyinput = false;
 			}
+			if (input.isDeletePressed()) {
+				deletepressed = true;
+				input.setDeletePressed(false);
+			}
 		} else {
 			if (cursor[0] && cursortime[0] != 0) {
 				cursortime[0] = 0;
@@ -247,6 +253,12 @@ public void render() {
 				main.saveConfig();
 				main.changeState(MainController.STATE_SELECTMUSIC);
 			}
+
+			if (input.isDeletePressed()) {
+				if(!deletepressed) resetKeyAssign(keysa[cursorpos], bmkeysa[cursorpos], midikeysa[cursorpos]);
+				deletepressed = true;
+				input.setDeletePressed(false);
+			} else deletepressed = false;
 		}
 
 		sprite.begin();
@@ -407,6 +419,30 @@ private void resetKeyAssign(int index) {
 		}
 	}
 
+	private void resetKeyAssign(int KBIndex, int BMIndex, int MidiIndex) {
+		final int noAssign = -1;
+		if (KBIndex >= 0) keyboardConfig.getKeyAssign()[KBIndex] = noAssign;
+		if(BMIndex >= 0) {
+				for (ControllerConfig cc : controllerConfigs) {
+					cc.getKeyAssign()[BMIndex] = noAssign;
+				}
+		} else if (BMIndex == -1) {
+			for (int i = 0; i < controllerConfigs.length; i++) {
+				controllerConfigs[i].setStart(noAssign);
+			}
+		} else if (BMIndex == -2) {
+			for (int i = 0; i < controllerConfigs.length; i++) {
+				controllerConfigs[i].setSelect(noAssign);
+			}
+		}
+		if(MidiIndex >= 0) midiconfig.setKeyAssign(MidiIndex, null);
+		else if (MidiIndex == -1) {
+			midiconfig.setStart(null);
+		} else if (MidiIndex == -2) {
+			midiconfig.setSelect(null);
+		}
+	}
+
 	private void setMidiKeyAssign(int index) {
 		resetKeyAssign(index);
 		if (index >= 0) {

src/bms/player/beatoraja/input/BMSPlayerInputProcessor.java

@@ -127,6 +127,7 @@ public BMSPlayerInputProcessor(Config config, PlayerConfig player) {
 
 	private boolean exitPressed;
 	private boolean enterPressed;
+	private boolean deletePressed;
 
 	boolean[] cursor = new boolean[4];
 	long[] cursortime = new long[4];
@@ -348,6 +349,14 @@ public void setEnterPressed(boolean enterPressed) {
 		this.enterPressed = enterPressed;
 	}
 
+	public boolean isDeletePressed() {
+		return deletePressed;
+	}
+
+	public void setDeletePressed(boolean deletePressed) {
+		this.deletePressed = deletePressed;
+	}
+
 	public boolean[] getFunctionstate() {
 		return functionstate;
 	}

src/bms/player/beatoraja/input/KeyBoardInputProcesseor.java

@@ -45,7 +45,9 @@ public class KeyBoardInputProcesseor extends BMSPlayerInputDevice implements Inp
 	private int exit = Keys.ESCAPE;
 
 	private int enter = Keys.ENTER;
-
+
+	private int delete = Keys.FORWARD_DEL;
+
 	private final IntArray reserved;
 	/**
 	 * 最後に押されたキー
@@ -172,6 +174,11 @@ public void poll(final long presstime) {
 			keystate[enter] = enterpressed;
 			this.bmsPlayerInputProcessor.setEnterPressed(enterpressed);
 		}
+		final boolean deletepressed = Gdx.input.isKeyPressed(delete);
+		if (deletepressed != keystate[delete]) {
+			keystate[delete] = deletepressed;
+			this.bmsPlayerInputProcessor.setDeletePressed(deletepressed);
+		}
 	}
 
 	public boolean mouseMoved(int arg0, int arg1) {