Fixed missing Alt/Control checks.

Fexcraft · Feb 22, 2020 · 83ecb1a · 83ecb1a
1 parent 6ef4845
commit 83ecb1a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/net/fexcraft/app/fmt/utils/GGR.java b/src/net/fexcraft/app/fmt/utils/GGR.java
@@ -21,7 +21,8 @@ public class GGR {
     public float maxlookrange = 85;
     public Vec3f pos, rotation;
     //
-    public boolean w_down, s_down, d_down, a_down, r_down, f_down, space_down, shift_down, alt_down, control_down;
+    public boolean w_down, s_down, d_down, a_down, r_down, f_down, space_down, shift_down;
+    public boolean left_alt_down, left_control_down, right_alt_down, right_control_down;
 
     public GGR(float x, float y, float z){
         pos = new Vec3f(x, y, z); rotation = new Vec3f(0, 0, 0);
@@ -146,11 +147,15 @@ public void processCameraInput(float delta){
     }
 
 	public static boolean isShiftDown(){
-		return FMTB.ggr.shift_down || FMTB.ggr.alt_down;
+		return FMTB.ggr.shift_down || isAltDown();
 	}
 
-	public static boolean iControlDown(){
-		return FMTB.ggr.control_down;
+	public static boolean isAltDown(){
+		return FMTB.ggr.left_alt_down || FMTB.ggr.right_alt_down;
+	}
+
+	public static boolean isControlDown(){
+		return FMTB.ggr.left_control_down || FMTB.ggr.right_control_down;
 	}
 
 	public static boolean parseKeyAction(int action){

diff --git a/src/net/fexcraft/app/fmt/utils/KeyCompound.java b/src/net/fexcraft/app/fmt/utils/KeyCompound.java
@@ -85,6 +85,10 @@ public static void init(){
 		//
 		keys.add(new KeyFunction("delete", GLFW_KEY_DELETE, action -> { if(action == GLFW_RELEASE) FMTB.MODEL.deleteSelected(); }));
 		keys.add(new KeyFunction("raypick", GLFW_KEY_T, action -> { if(action == GLFW_RELEASE) RayCoastAway.doTest(true); }));
+		keys.add(new KeyFunction("left_control", GLFW_KEY_LEFT_CONTROL, (action) -> FMTB.ggr.left_control_down = GGR.parseKeyAction(action)));
+		keys.add(new KeyFunction("left_alt", GLFW_KEY_LEFT_ALT, (action) -> FMTB.ggr.left_alt_down = GGR.parseKeyAction(action)));
+		keys.add(new KeyFunction("right_control", GLFW_KEY_RIGHT_CONTROL, (action) -> FMTB.ggr.right_control_down = GGR.parseKeyAction(action)));
+		keys.add(new KeyFunction("right_alt", GLFW_KEY_RIGHT_ALT, (action) -> FMTB.ggr.right_alt_down = GGR.parseKeyAction(action)));
 	}
 
 	public static void load(){

diff --git a/src/net/fexcraft/app/fmt/utils/RayCoastAway.java b/src/net/fexcraft/app/fmt/utils/RayCoastAway.java
@@ -69,9 +69,9 @@ public static void doTest(boolean bool, boolean mouseoff){
 		PolygonWrapper wrapper = getSelected(id);
 		if(wrapper == null) return;
 		if(!TextureEditor.BUCKETMODE){
-			boolean control = false;//Keyboard.isKeyDown(Keyboard.KEY_LCONTROL);
+			boolean control = GGR.isControlDown();
 			boolean state = control ? wrapper.getTurboList().selected : wrapper.selected;
-			if(true/*!Keyboard.isKeyDown(Keyboard.KEY_LMENU)*/) FMTB.MODEL.clearSelection();
+			if(!GGR.isAltDown()) FMTB.MODEL.clearSelection();
 			if(control){
 				wrapper.getTurboList().selected = !state;
 				GroupCompound.SELECTED_POLYGONS = FMTB.MODEL.countSelectedMRTs();