diff --git a/src/main/java/me/eigenraven/lwjgl3ify/core/FixConstantPoolInterfaceMethodRefHelper.java b/src/main/java/me/eigenraven/lwjgl3ify/core/FixConstantPoolInterfaceMethodRefHelper.java index e290d0f..f6c16ac 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/core/FixConstantPoolInterfaceMethodRefHelper.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/core/FixConstantPoolInterfaceMethodRefHelper.java @@ -41,7 +41,7 @@ public class FixConstantPoolInterfaceMethodRefHelper { private boolean validateInstruction(String internalClassName, AbstractInsnNode rawInsn) { AtomicBoolean changed = new AtomicBoolean(false); switch (rawInsn.getType()) { - case AbstractInsnNode.INVOKE_DYNAMIC_INSN: + case AbstractInsnNode.INVOKE_DYNAMIC_INSN -> { final InvokeDynamicInsnNode insn = (InvokeDynamicInsnNode) rawInsn; insn.bsm = fixHandle(internalClassName, insn.bsm, changed); if (insn.bsmArgs != null) { @@ -52,10 +52,10 @@ public class FixConstantPoolInterfaceMethodRefHelper { } } } - break; - default: - // no-op - break; + } + default -> { + } + // no-op } return changed.get(); } diff --git a/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/ChannelLWJGLOpenAL.java b/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/ChannelLWJGLOpenAL.java index 1a89ae6..e2dc913 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/ChannelLWJGLOpenAL.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/ChannelLWJGLOpenAL.java @@ -406,20 +406,12 @@ public class ChannelLWJGLOpenAL extends Channel { float bytesPerFrame = 1f; switch (ALformat) { - case AL10.AL_FORMAT_MONO8: - bytesPerFrame = 1f; - break; - case AL10.AL_FORMAT_MONO16: - bytesPerFrame = 2f; - break; - case AL10.AL_FORMAT_STEREO8: - bytesPerFrame = 2f; - break; - case AL10.AL_FORMAT_STEREO16: - bytesPerFrame = 4f; - break; - default: - break; + case AL10.AL_FORMAT_MONO8 -> bytesPerFrame = 1f; + case AL10.AL_FORMAT_MONO16 -> bytesPerFrame = 2f; + case AL10.AL_FORMAT_STEREO8 -> bytesPerFrame = 2f; + case AL10.AL_FORMAT_STEREO16 -> bytesPerFrame = 4f; + default -> { + } } offset = (((float) offset / bytesPerFrame) / (float) sampleRate) * 1000; @@ -553,26 +545,33 @@ public class ChannelLWJGLOpenAL extends Channel { */ private boolean checkALError() { switch (AL10.alGetError()) { - case AL10.AL_NO_ERROR: + case AL10.AL_NO_ERROR -> { return false; - case AL10.AL_INVALID_NAME: + } + case AL10.AL_INVALID_NAME -> { errorMessage("Invalid name parameter."); return true; - case AL10.AL_INVALID_ENUM: + } + case AL10.AL_INVALID_ENUM -> { errorMessage("Invalid parameter."); return true; - case AL10.AL_INVALID_VALUE: + } + case AL10.AL_INVALID_VALUE -> { errorMessage("Invalid enumerated parameter value."); return true; - case AL10.AL_INVALID_OPERATION: + } + case AL10.AL_INVALID_OPERATION -> { errorMessage("Illegal call."); return true; - case AL10.AL_OUT_OF_MEMORY: + } + case AL10.AL_OUT_OF_MEMORY -> { errorMessage("Unable to allocate memory."); return true; - default: + } + default -> { errorMessage("An unrecognized error occurred."); return true; + } } } } diff --git a/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/LibraryLWJGLOpenAL.java b/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/LibraryLWJGLOpenAL.java index 17f6593..1d6d202 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/LibraryLWJGLOpenAL.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/LibraryLWJGLOpenAL.java @@ -872,26 +872,33 @@ public class LibraryLWJGLOpenAL extends Library { */ private boolean checkALError() { switch (AL10.alGetError()) { - case AL10.AL_NO_ERROR: + case AL10.AL_NO_ERROR -> { return false; - case AL10.AL_INVALID_NAME: + } + case AL10.AL_INVALID_NAME -> { errorMessage("Invalid name parameter."); return true; - case AL10.AL_INVALID_ENUM: + } + case AL10.AL_INVALID_ENUM -> { errorMessage("Invalid parameter."); return true; - case AL10.AL_INVALID_VALUE: + } + case AL10.AL_INVALID_VALUE -> { errorMessage("Invalid enumerated parameter value."); return true; - case AL10.AL_INVALID_OPERATION: + } + case AL10.AL_INVALID_OPERATION -> { errorMessage("Illegal call."); return true; - case AL10.AL_OUT_OF_MEMORY: + } + case AL10.AL_OUT_OF_MEMORY -> { errorMessage("Unable to allocate memory."); return true; - default: + } + default -> { errorMessage("An unrecognized error occurred."); return true; + } } } diff --git a/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/SourceLWJGLOpenAL.java b/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/SourceLWJGLOpenAL.java index adc00bf..4bdd617 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/SourceLWJGLOpenAL.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/SourceLWJGLOpenAL.java @@ -696,26 +696,33 @@ public class SourceLWJGLOpenAL extends Source { */ private boolean checkALError() { switch (AL10.alGetError()) { - case AL10.AL_NO_ERROR: + case AL10.AL_NO_ERROR -> { return false; - case AL10.AL_INVALID_NAME: + } + case AL10.AL_INVALID_NAME -> { errorMessage("Invalid name parameter."); return true; - case AL10.AL_INVALID_ENUM: + } + case AL10.AL_INVALID_ENUM -> { errorMessage("Invalid parameter."); return true; - case AL10.AL_INVALID_VALUE: + } + case AL10.AL_INVALID_VALUE -> { errorMessage("Invalid enumerated parameter value."); return true; - case AL10.AL_INVALID_OPERATION: + } + case AL10.AL_INVALID_OPERATION -> { errorMessage("Illegal call."); return true; - case AL10.AL_OUT_OF_MEMORY: + } + case AL10.AL_OUT_OF_MEMORY -> { errorMessage("Unable to allocate memory."); return true; - default: + } + default -> { errorMessage("An unrecognized error occurred."); return true; + } } } } diff --git a/src/main/java/org/lwjglx/LWJGLUtil.java b/src/main/java/org/lwjglx/LWJGLUtil.java index a149913..5ad4104 100644 --- a/src/main/java/org/lwjglx/LWJGLUtil.java +++ b/src/main/java/org/lwjglx/LWJGLUtil.java @@ -272,17 +272,10 @@ public class LWJGLUtil { static { switch (Platform.get()) { - case WINDOWS: - PLATFORM = PLATFORM_WINDOWS; - break; - case LINUX: - PLATFORM = PLATFORM_LINUX; - break; - case MACOSX: - PLATFORM = PLATFORM_MACOSX; - break; - default: - throw new LinkageError("Unknown platform: " + Platform.get()); + case WINDOWS -> PLATFORM = PLATFORM_WINDOWS; + case LINUX -> PLATFORM = PLATFORM_LINUX; + case MACOSX -> PLATFORM = PLATFORM_MACOSX; + default -> throw new LinkageError("Unknown platform: " + Platform.get()); } } @@ -312,16 +305,12 @@ public class LWJGLUtil { * @return current platform name */ public static String getPlatformName() { - switch (LWJGLUtil.getPlatform()) { - case LWJGLUtil.PLATFORM_LINUX: - return PLATFORM_LINUX_NAME; - case LWJGLUtil.PLATFORM_MACOSX: - return PLATFORM_MACOSX_NAME; - case LWJGLUtil.PLATFORM_WINDOWS: - return PLATFORM_WINDOWS_NAME; - default: - return "unknown"; - } + return switch (LWJGLUtil.getPlatform()) { + case LWJGLUtil.PLATFORM_LINUX -> PLATFORM_LINUX_NAME; + case LWJGLUtil.PLATFORM_MACOSX -> PLATFORM_MACOSX_NAME; + case LWJGLUtil.PLATFORM_WINDOWS -> PLATFORM_WINDOWS_NAME; + default -> "unknown"; + }; } /** diff --git a/src/main/java/org/lwjglx/input/KeyCodes.java b/src/main/java/org/lwjglx/input/KeyCodes.java index e11abdd..9833232 100644 --- a/src/main/java/org/lwjglx/input/KeyCodes.java +++ b/src/main/java/org/lwjglx/input/KeyCodes.java @@ -8,539 +8,289 @@ public class KeyCodes { if (glfwKeyCode > GLFW.GLFW_KEY_LAST) { return glfwKeyCode; } - switch (glfwKeyCode) { - case GLFW.GLFW_KEY_ESCAPE: - return Keyboard.KEY_ESCAPE; - case GLFW.GLFW_KEY_BACKSPACE: - return Keyboard.KEY_BACK; - case GLFW.GLFW_KEY_TAB: - return Keyboard.KEY_TAB; - case GLFW.GLFW_KEY_ENTER: - return Keyboard.KEY_RETURN; - case GLFW.GLFW_KEY_SPACE: - return Keyboard.KEY_SPACE; + return switch (glfwKeyCode) { + case GLFW.GLFW_KEY_ESCAPE -> Keyboard.KEY_ESCAPE; + case GLFW.GLFW_KEY_BACKSPACE -> Keyboard.KEY_BACK; + case GLFW.GLFW_KEY_TAB -> Keyboard.KEY_TAB; + case GLFW.GLFW_KEY_ENTER -> Keyboard.KEY_RETURN; + case GLFW.GLFW_KEY_SPACE -> Keyboard.KEY_SPACE; + case GLFW.GLFW_KEY_LEFT_CONTROL -> Keyboard.KEY_LCONTROL; + case GLFW.GLFW_KEY_LEFT_SHIFT -> Keyboard.KEY_LSHIFT; + case GLFW.GLFW_KEY_LEFT_ALT -> Keyboard.KEY_LMENU; + case GLFW.GLFW_KEY_LEFT_SUPER -> Keyboard.KEY_LMETA; + case GLFW.GLFW_KEY_RIGHT_CONTROL -> Keyboard.KEY_RCONTROL; + case GLFW.GLFW_KEY_RIGHT_SHIFT -> Keyboard.KEY_RSHIFT; + case GLFW.GLFW_KEY_RIGHT_ALT -> Keyboard.KEY_RMENU; + case GLFW.GLFW_KEY_RIGHT_SUPER -> Keyboard.KEY_RMETA; + case GLFW.GLFW_KEY_1 -> Keyboard.KEY_1; + case GLFW.GLFW_KEY_2 -> Keyboard.KEY_2; + case GLFW.GLFW_KEY_3 -> Keyboard.KEY_3; + case GLFW.GLFW_KEY_4 -> Keyboard.KEY_4; + case GLFW.GLFW_KEY_5 -> Keyboard.KEY_5; + case GLFW.GLFW_KEY_6 -> Keyboard.KEY_6; + case GLFW.GLFW_KEY_7 -> Keyboard.KEY_7; + case GLFW.GLFW_KEY_8 -> Keyboard.KEY_8; + case GLFW.GLFW_KEY_9 -> Keyboard.KEY_9; + case GLFW.GLFW_KEY_0 -> Keyboard.KEY_0; + case GLFW.GLFW_KEY_A -> Keyboard.KEY_A; + case GLFW.GLFW_KEY_B -> Keyboard.KEY_B; + case GLFW.GLFW_KEY_C -> Keyboard.KEY_C; + case GLFW.GLFW_KEY_D -> Keyboard.KEY_D; + case GLFW.GLFW_KEY_E -> Keyboard.KEY_E; + case GLFW.GLFW_KEY_F -> Keyboard.KEY_F; + case GLFW.GLFW_KEY_G -> Keyboard.KEY_G; + case GLFW.GLFW_KEY_H -> Keyboard.KEY_H; + case GLFW.GLFW_KEY_I -> Keyboard.KEY_I; + case GLFW.GLFW_KEY_J -> Keyboard.KEY_J; + case GLFW.GLFW_KEY_K -> Keyboard.KEY_K; + case GLFW.GLFW_KEY_L -> Keyboard.KEY_L; + case GLFW.GLFW_KEY_M -> Keyboard.KEY_M; + case GLFW.GLFW_KEY_N -> Keyboard.KEY_N; + case GLFW.GLFW_KEY_O -> Keyboard.KEY_O; + case GLFW.GLFW_KEY_P -> Keyboard.KEY_P; + case GLFW.GLFW_KEY_Q -> Keyboard.KEY_Q; + case GLFW.GLFW_KEY_R -> Keyboard.KEY_R; + case GLFW.GLFW_KEY_S -> Keyboard.KEY_S; + case GLFW.GLFW_KEY_T -> Keyboard.KEY_T; + case GLFW.GLFW_KEY_U -> Keyboard.KEY_U; + case GLFW.GLFW_KEY_V -> Keyboard.KEY_V; + case GLFW.GLFW_KEY_W -> Keyboard.KEY_W; + case GLFW.GLFW_KEY_X -> Keyboard.KEY_X; + case GLFW.GLFW_KEY_Y -> Keyboard.KEY_Y; + case GLFW.GLFW_KEY_Z -> Keyboard.KEY_Z; + case GLFW.GLFW_KEY_UP -> Keyboard.KEY_UP; + case GLFW.GLFW_KEY_DOWN -> Keyboard.KEY_DOWN; + case GLFW.GLFW_KEY_LEFT -> Keyboard.KEY_LEFT; + case GLFW.GLFW_KEY_RIGHT -> Keyboard.KEY_RIGHT; + case GLFW.GLFW_KEY_INSERT -> Keyboard.KEY_INSERT; + case GLFW.GLFW_KEY_DELETE -> Keyboard.KEY_DELETE; + case GLFW.GLFW_KEY_HOME -> Keyboard.KEY_HOME; + case GLFW.GLFW_KEY_END -> Keyboard.KEY_END; + case GLFW.GLFW_KEY_PAGE_UP -> Keyboard.KEY_PRIOR; + case GLFW.GLFW_KEY_PAGE_DOWN -> Keyboard.KEY_NEXT; + case GLFW.GLFW_KEY_F1 -> Keyboard.KEY_F1; + case GLFW.GLFW_KEY_F2 -> Keyboard.KEY_F2; + case GLFW.GLFW_KEY_F3 -> Keyboard.KEY_F3; + case GLFW.GLFW_KEY_F4 -> Keyboard.KEY_F4; + case GLFW.GLFW_KEY_F5 -> Keyboard.KEY_F5; + case GLFW.GLFW_KEY_F6 -> Keyboard.KEY_F6; + case GLFW.GLFW_KEY_F7 -> Keyboard.KEY_F7; + case GLFW.GLFW_KEY_F8 -> Keyboard.KEY_F8; + case GLFW.GLFW_KEY_F9 -> Keyboard.KEY_F9; + case GLFW.GLFW_KEY_F10 -> Keyboard.KEY_F10; + case GLFW.GLFW_KEY_F11 -> Keyboard.KEY_F11; + case GLFW.GLFW_KEY_F12 -> Keyboard.KEY_F12; + case GLFW.GLFW_KEY_F13 -> Keyboard.KEY_F13; + case GLFW.GLFW_KEY_F14 -> Keyboard.KEY_F14; + case GLFW.GLFW_KEY_F15 -> Keyboard.KEY_F15; + case GLFW.GLFW_KEY_F16 -> Keyboard.KEY_F16; + case GLFW.GLFW_KEY_F17 -> Keyboard.KEY_F17; + case GLFW.GLFW_KEY_F18 -> Keyboard.KEY_F18; + case GLFW.GLFW_KEY_F19 -> Keyboard.KEY_F19; + case GLFW.GLFW_KEY_KP_1 -> Keyboard.KEY_NUMPAD1; + case GLFW.GLFW_KEY_KP_2 -> Keyboard.KEY_NUMPAD2; + case GLFW.GLFW_KEY_KP_3 -> Keyboard.KEY_NUMPAD3; + case GLFW.GLFW_KEY_KP_4 -> Keyboard.KEY_NUMPAD4; + case GLFW.GLFW_KEY_KP_5 -> Keyboard.KEY_NUMPAD5; + case GLFW.GLFW_KEY_KP_6 -> Keyboard.KEY_NUMPAD6; + case GLFW.GLFW_KEY_KP_7 -> Keyboard.KEY_NUMPAD7; + case GLFW.GLFW_KEY_KP_8 -> Keyboard.KEY_NUMPAD8; + case GLFW.GLFW_KEY_KP_9 -> Keyboard.KEY_NUMPAD9; + case GLFW.GLFW_KEY_KP_0 -> Keyboard.KEY_NUMPAD0; + case GLFW.GLFW_KEY_KP_ADD -> Keyboard.KEY_ADD; + case GLFW.GLFW_KEY_KP_SUBTRACT -> Keyboard.KEY_SUBTRACT; + case GLFW.GLFW_KEY_KP_MULTIPLY -> Keyboard.KEY_MULTIPLY; + case GLFW.GLFW_KEY_KP_DIVIDE -> Keyboard.KEY_DIVIDE; + case GLFW.GLFW_KEY_KP_DECIMAL -> Keyboard.KEY_DECIMAL; + case GLFW.GLFW_KEY_KP_EQUAL -> Keyboard.KEY_NUMPADEQUALS; + case GLFW.GLFW_KEY_KP_ENTER -> Keyboard.KEY_NUMPADENTER; + case GLFW.GLFW_KEY_NUM_LOCK -> Keyboard.KEY_NUMLOCK; + case GLFW.GLFW_KEY_SEMICOLON -> Keyboard.KEY_SEMICOLON; + case GLFW.GLFW_KEY_BACKSLASH -> Keyboard.KEY_BACKSLASH; + case GLFW.GLFW_KEY_COMMA -> Keyboard.KEY_COMMA; + case GLFW.GLFW_KEY_PERIOD -> Keyboard.KEY_PERIOD; + case GLFW.GLFW_KEY_SLASH -> Keyboard.KEY_SLASH; + case GLFW.GLFW_KEY_GRAVE_ACCENT -> Keyboard.KEY_GRAVE; + case GLFW.GLFW_KEY_CAPS_LOCK -> Keyboard.KEY_CAPITAL; + case GLFW.GLFW_KEY_SCROLL_LOCK -> Keyboard.KEY_SCROLL; + case GLFW.GLFW_KEY_WORLD_1 -> Keyboard.KEY_CIRCUMFLEX; // TODO not sure if correct + case GLFW.GLFW_KEY_PAUSE -> Keyboard.KEY_PAUSE; + case GLFW.GLFW_KEY_MINUS -> Keyboard.KEY_MINUS; + case GLFW.GLFW_KEY_EQUAL -> Keyboard.KEY_EQUALS; + case GLFW.GLFW_KEY_LEFT_BRACKET -> Keyboard.KEY_LBRACKET; + case GLFW.GLFW_KEY_RIGHT_BRACKET -> Keyboard.KEY_RBRACKET; + case GLFW.GLFW_KEY_APOSTROPHE -> Keyboard.KEY_APOSTROPHE; + // public static final int KEY_AT = 0x91; /* (NEC PC98) */ + // public static final int KEY_COLON = 0x92; /* (NEC PC98) */ + // public static final int KEY_UNDERLINE = 0x93; /* (NEC PC98) */ - case GLFW.GLFW_KEY_LEFT_CONTROL: - return Keyboard.KEY_LCONTROL; - case GLFW.GLFW_KEY_LEFT_SHIFT: - return Keyboard.KEY_LSHIFT; - case GLFW.GLFW_KEY_LEFT_ALT: - return Keyboard.KEY_LMENU; - case GLFW.GLFW_KEY_LEFT_SUPER: - return Keyboard.KEY_LMETA; + // public static final int KEY_KANA = 0x70; /* (Japanese keyboard) */ + // public static final int KEY_CONVERT = 0x79; /* (Japanese keyboard) */ + // public static final int KEY_NOCONVERT = 0x7B; /* (Japanese keyboard) */ + // public static final int KEY_YEN = 0x7D; /* (Japanese keyboard) */ + // public static final int KEY_CIRCUMFLEX = 0x90; /* (Japanese keyboard) */ + // public static final int KEY_KANJI = 0x94; /* (Japanese keyboard) */ + // public static final int KEY_STOP = 0x95; /* (NEC PC98) */ + // public static final int KEY_AX = 0x96; /* (Japan AX) */ + // public static final int KEY_UNLABELED = 0x97; /* (J3100) */ + // public static final int KEY_SECTION = 0xA7; /* Section symbol (Mac) */ + // public static final int KEY_NUMPADCOMMA = 0xB3; /* , on numeric keypad (NEC PC98) */ + // public static final int KEY_SYSRQ = 0xB7; + // public static final int KEY_FUNCTION = 0xC4; /* Function (Mac) */ + // public static final int KEY_CLEAR = 0xDA; /* Clear key (Mac) */ - case GLFW.GLFW_KEY_RIGHT_CONTROL: - return Keyboard.KEY_RCONTROL; - case GLFW.GLFW_KEY_RIGHT_SHIFT: - return Keyboard.KEY_RSHIFT; - case GLFW.GLFW_KEY_RIGHT_ALT: - return Keyboard.KEY_RMENU; - case GLFW.GLFW_KEY_RIGHT_SUPER: - return Keyboard.KEY_RMETA; + // public static final int KEY_APPS = 0xDD; /* AppMenu key */ + // public static final int KEY_POWER = 0xDE; + // public static final int KEY_SLEEP = 0xDF; - case GLFW.GLFW_KEY_1: - return Keyboard.KEY_1; - case GLFW.GLFW_KEY_2: - return Keyboard.KEY_2; - case GLFW.GLFW_KEY_3: - return Keyboard.KEY_3; - case GLFW.GLFW_KEY_4: - return Keyboard.KEY_4; - case GLFW.GLFW_KEY_5: - return Keyboard.KEY_5; - case GLFW.GLFW_KEY_6: - return Keyboard.KEY_6; - case GLFW.GLFW_KEY_7: - return Keyboard.KEY_7; - case GLFW.GLFW_KEY_8: - return Keyboard.KEY_8; - case GLFW.GLFW_KEY_9: - return Keyboard.KEY_9; - case GLFW.GLFW_KEY_0: - return Keyboard.KEY_0; - - case GLFW.GLFW_KEY_A: - return Keyboard.KEY_A; - case GLFW.GLFW_KEY_B: - return Keyboard.KEY_B; - case GLFW.GLFW_KEY_C: - return Keyboard.KEY_C; - case GLFW.GLFW_KEY_D: - return Keyboard.KEY_D; - case GLFW.GLFW_KEY_E: - return Keyboard.KEY_E; - case GLFW.GLFW_KEY_F: - return Keyboard.KEY_F; - case GLFW.GLFW_KEY_G: - return Keyboard.KEY_G; - case GLFW.GLFW_KEY_H: - return Keyboard.KEY_H; - case GLFW.GLFW_KEY_I: - return Keyboard.KEY_I; - case GLFW.GLFW_KEY_J: - return Keyboard.KEY_J; - case GLFW.GLFW_KEY_K: - return Keyboard.KEY_K; - case GLFW.GLFW_KEY_L: - return Keyboard.KEY_L; - case GLFW.GLFW_KEY_M: - return Keyboard.KEY_M; - case GLFW.GLFW_KEY_N: - return Keyboard.KEY_N; - case GLFW.GLFW_KEY_O: - return Keyboard.KEY_O; - case GLFW.GLFW_KEY_P: - return Keyboard.KEY_P; - case GLFW.GLFW_KEY_Q: - return Keyboard.KEY_Q; - case GLFW.GLFW_KEY_R: - return Keyboard.KEY_R; - case GLFW.GLFW_KEY_S: - return Keyboard.KEY_S; - case GLFW.GLFW_KEY_T: - return Keyboard.KEY_T; - case GLFW.GLFW_KEY_U: - return Keyboard.KEY_U; - case GLFW.GLFW_KEY_V: - return Keyboard.KEY_V; - case GLFW.GLFW_KEY_W: - return Keyboard.KEY_W; - case GLFW.GLFW_KEY_X: - return Keyboard.KEY_X; - case GLFW.GLFW_KEY_Y: - return Keyboard.KEY_Y; - case GLFW.GLFW_KEY_Z: - return Keyboard.KEY_Z; - - case GLFW.GLFW_KEY_UP: - return Keyboard.KEY_UP; - case GLFW.GLFW_KEY_DOWN: - return Keyboard.KEY_DOWN; - case GLFW.GLFW_KEY_LEFT: - return Keyboard.KEY_LEFT; - case GLFW.GLFW_KEY_RIGHT: - return Keyboard.KEY_RIGHT; - - case GLFW.GLFW_KEY_INSERT: - return Keyboard.KEY_INSERT; - case GLFW.GLFW_KEY_DELETE: - return Keyboard.KEY_DELETE; - case GLFW.GLFW_KEY_HOME: - return Keyboard.KEY_HOME; - case GLFW.GLFW_KEY_END: - return Keyboard.KEY_END; - case GLFW.GLFW_KEY_PAGE_UP: - return Keyboard.KEY_PRIOR; - case GLFW.GLFW_KEY_PAGE_DOWN: - return Keyboard.KEY_NEXT; - - case GLFW.GLFW_KEY_F1: - return Keyboard.KEY_F1; - case GLFW.GLFW_KEY_F2: - return Keyboard.KEY_F2; - case GLFW.GLFW_KEY_F3: - return Keyboard.KEY_F3; - case GLFW.GLFW_KEY_F4: - return Keyboard.KEY_F4; - case GLFW.GLFW_KEY_F5: - return Keyboard.KEY_F5; - case GLFW.GLFW_KEY_F6: - return Keyboard.KEY_F6; - case GLFW.GLFW_KEY_F7: - return Keyboard.KEY_F7; - case GLFW.GLFW_KEY_F8: - return Keyboard.KEY_F8; - case GLFW.GLFW_KEY_F9: - return Keyboard.KEY_F9; - case GLFW.GLFW_KEY_F10: - return Keyboard.KEY_F10; - case GLFW.GLFW_KEY_F11: - return Keyboard.KEY_F11; - case GLFW.GLFW_KEY_F12: - return Keyboard.KEY_F12; - case GLFW.GLFW_KEY_F13: - return Keyboard.KEY_F13; - case GLFW.GLFW_KEY_F14: - return Keyboard.KEY_F14; - case GLFW.GLFW_KEY_F15: - return Keyboard.KEY_F15; - case GLFW.GLFW_KEY_F16: - return Keyboard.KEY_F16; - case GLFW.GLFW_KEY_F17: - return Keyboard.KEY_F17; - case GLFW.GLFW_KEY_F18: - return Keyboard.KEY_F18; - case GLFW.GLFW_KEY_F19: - return Keyboard.KEY_F19; - - case GLFW.GLFW_KEY_KP_1: - return Keyboard.KEY_NUMPAD1; - case GLFW.GLFW_KEY_KP_2: - return Keyboard.KEY_NUMPAD2; - case GLFW.GLFW_KEY_KP_3: - return Keyboard.KEY_NUMPAD3; - case GLFW.GLFW_KEY_KP_4: - return Keyboard.KEY_NUMPAD4; - case GLFW.GLFW_KEY_KP_5: - return Keyboard.KEY_NUMPAD5; - case GLFW.GLFW_KEY_KP_6: - return Keyboard.KEY_NUMPAD6; - case GLFW.GLFW_KEY_KP_7: - return Keyboard.KEY_NUMPAD7; - case GLFW.GLFW_KEY_KP_8: - return Keyboard.KEY_NUMPAD8; - case GLFW.GLFW_KEY_KP_9: - return Keyboard.KEY_NUMPAD9; - case GLFW.GLFW_KEY_KP_0: - return Keyboard.KEY_NUMPAD0; - - case GLFW.GLFW_KEY_KP_ADD: - return Keyboard.KEY_ADD; - case GLFW.GLFW_KEY_KP_SUBTRACT: - return Keyboard.KEY_SUBTRACT; - case GLFW.GLFW_KEY_KP_MULTIPLY: - return Keyboard.KEY_MULTIPLY; - case GLFW.GLFW_KEY_KP_DIVIDE: - return Keyboard.KEY_DIVIDE; - case GLFW.GLFW_KEY_KP_DECIMAL: - return Keyboard.KEY_DECIMAL; - case GLFW.GLFW_KEY_KP_EQUAL: - return Keyboard.KEY_NUMPADEQUALS; - case GLFW.GLFW_KEY_KP_ENTER: - return Keyboard.KEY_NUMPADENTER; - case GLFW.GLFW_KEY_NUM_LOCK: - return Keyboard.KEY_NUMLOCK; - - case GLFW.GLFW_KEY_SEMICOLON: - return Keyboard.KEY_SEMICOLON; - case GLFW.GLFW_KEY_BACKSLASH: - return Keyboard.KEY_BACKSLASH; - case GLFW.GLFW_KEY_COMMA: - return Keyboard.KEY_COMMA; - case GLFW.GLFW_KEY_PERIOD: - return Keyboard.KEY_PERIOD; - case GLFW.GLFW_KEY_SLASH: - return Keyboard.KEY_SLASH; - case GLFW.GLFW_KEY_GRAVE_ACCENT: - return Keyboard.KEY_GRAVE; - - case GLFW.GLFW_KEY_CAPS_LOCK: - return Keyboard.KEY_CAPITAL; - case GLFW.GLFW_KEY_SCROLL_LOCK: - return Keyboard.KEY_SCROLL; - - case GLFW.GLFW_KEY_WORLD_1: - return Keyboard.KEY_CIRCUMFLEX; // TODO not sure if correct - case GLFW.GLFW_KEY_PAUSE: - return Keyboard.KEY_PAUSE; - - case GLFW.GLFW_KEY_MINUS: - return Keyboard.KEY_MINUS; - case GLFW.GLFW_KEY_EQUAL: - return Keyboard.KEY_EQUALS; - case GLFW.GLFW_KEY_LEFT_BRACKET: - return Keyboard.KEY_LBRACKET; - case GLFW.GLFW_KEY_RIGHT_BRACKET: - return Keyboard.KEY_RBRACKET; - case GLFW.GLFW_KEY_APOSTROPHE: - return Keyboard.KEY_APOSTROPHE; - // public static final int KEY_AT = 0x91; /* (NEC PC98) */ - // public static final int KEY_COLON = 0x92; /* (NEC PC98) */ - // public static final int KEY_UNDERLINE = 0x93; /* (NEC PC98) */ - - // public static final int KEY_KANA = 0x70; /* (Japanese keyboard) */ - // public static final int KEY_CONVERT = 0x79; /* (Japanese keyboard) */ - // public static final int KEY_NOCONVERT = 0x7B; /* (Japanese keyboard) */ - // public static final int KEY_YEN = 0x7D; /* (Japanese keyboard) */ - // public static final int KEY_CIRCUMFLEX = 0x90; /* (Japanese keyboard) */ - // public static final int KEY_KANJI = 0x94; /* (Japanese keyboard) */ - // public static final int KEY_STOP = 0x95; /* (NEC PC98) */ - // public static final int KEY_AX = 0x96; /* (Japan AX) */ - // public static final int KEY_UNLABELED = 0x97; /* (J3100) */ - // public static final int KEY_SECTION = 0xA7; /* Section symbol (Mac) */ - // public static final int KEY_NUMPADCOMMA = 0xB3; /* , on numeric keypad (NEC PC98) */ - // public static final int KEY_SYSRQ = 0xB7; - // public static final int KEY_FUNCTION = 0xC4; /* Function (Mac) */ - // public static final int KEY_CLEAR = 0xDA; /* Clear key (Mac) */ - - // public static final int KEY_APPS = 0xDD; /* AppMenu key */ - // public static final int KEY_POWER = 0xDE; - // public static final int KEY_SLEEP = 0xDF; - - default: - return Keyboard.KEY_NONE; - } + default -> Keyboard.KEY_NONE; + }; } public static int toGlfwKey(int lwjglKeyCode) { if (lwjglKeyCode > GLFW.GLFW_KEY_LAST) { return lwjglKeyCode; } - switch (lwjglKeyCode) { - case Keyboard.KEY_NONE: - return 0; - case Keyboard.KEY_ESCAPE: - return GLFW.GLFW_KEY_ESCAPE; - case Keyboard.KEY_BACK: - return GLFW.GLFW_KEY_BACKSPACE; - case Keyboard.KEY_TAB: - return GLFW.GLFW_KEY_TAB; - case Keyboard.KEY_RETURN: - return GLFW.GLFW_KEY_ENTER; - case Keyboard.KEY_SPACE: - return GLFW.GLFW_KEY_SPACE; + return switch (lwjglKeyCode) { + case Keyboard.KEY_NONE -> 0; + case Keyboard.KEY_ESCAPE -> GLFW.GLFW_KEY_ESCAPE; + case Keyboard.KEY_BACK -> GLFW.GLFW_KEY_BACKSPACE; + case Keyboard.KEY_TAB -> GLFW.GLFW_KEY_TAB; + case Keyboard.KEY_RETURN -> GLFW.GLFW_KEY_ENTER; + case Keyboard.KEY_SPACE -> GLFW.GLFW_KEY_SPACE; + case Keyboard.KEY_LCONTROL -> GLFW.GLFW_KEY_LEFT_CONTROL; + case Keyboard.KEY_LSHIFT -> GLFW.GLFW_KEY_LEFT_SHIFT; + case Keyboard.KEY_LMENU -> GLFW.GLFW_KEY_LEFT_ALT; + case Keyboard.KEY_LMETA -> GLFW.GLFW_KEY_LEFT_SUPER; + case Keyboard.KEY_RCONTROL -> GLFW.GLFW_KEY_RIGHT_CONTROL; + case Keyboard.KEY_RSHIFT -> GLFW.GLFW_KEY_RIGHT_SHIFT; + case Keyboard.KEY_RMENU -> GLFW.GLFW_KEY_RIGHT_ALT; + case Keyboard.KEY_RMETA -> GLFW.GLFW_KEY_RIGHT_SUPER; + case Keyboard.KEY_1 -> GLFW.GLFW_KEY_1; + case Keyboard.KEY_2 -> GLFW.GLFW_KEY_2; + case Keyboard.KEY_3 -> GLFW.GLFW_KEY_3; + case Keyboard.KEY_4 -> GLFW.GLFW_KEY_4; + case Keyboard.KEY_5 -> GLFW.GLFW_KEY_5; + case Keyboard.KEY_6 -> GLFW.GLFW_KEY_6; + case Keyboard.KEY_7 -> GLFW.GLFW_KEY_7; + case Keyboard.KEY_8 -> GLFW.GLFW_KEY_8; + case Keyboard.KEY_9 -> GLFW.GLFW_KEY_9; + case Keyboard.KEY_0 -> GLFW.GLFW_KEY_0; + case Keyboard.KEY_A -> GLFW.GLFW_KEY_A; + case Keyboard.KEY_B -> GLFW.GLFW_KEY_B; + case Keyboard.KEY_C -> GLFW.GLFW_KEY_C; + case Keyboard.KEY_D -> GLFW.GLFW_KEY_D; + case Keyboard.KEY_E -> GLFW.GLFW_KEY_E; + case Keyboard.KEY_F -> GLFW.GLFW_KEY_F; + case Keyboard.KEY_G -> GLFW.GLFW_KEY_G; + case Keyboard.KEY_H -> GLFW.GLFW_KEY_H; + case Keyboard.KEY_I -> GLFW.GLFW_KEY_I; + case Keyboard.KEY_J -> GLFW.GLFW_KEY_J; + case Keyboard.KEY_K -> GLFW.GLFW_KEY_K; + case Keyboard.KEY_L -> GLFW.GLFW_KEY_L; + case Keyboard.KEY_M -> GLFW.GLFW_KEY_M; + case Keyboard.KEY_N -> GLFW.GLFW_KEY_N; + case Keyboard.KEY_O -> GLFW.GLFW_KEY_O; + case Keyboard.KEY_P -> GLFW.GLFW_KEY_P; + case Keyboard.KEY_Q -> GLFW.GLFW_KEY_Q; + case Keyboard.KEY_R -> GLFW.GLFW_KEY_R; + case Keyboard.KEY_S -> GLFW.GLFW_KEY_S; + case Keyboard.KEY_T -> GLFW.GLFW_KEY_T; + case Keyboard.KEY_U -> GLFW.GLFW_KEY_U; + case Keyboard.KEY_V -> GLFW.GLFW_KEY_V; + case Keyboard.KEY_W -> GLFW.GLFW_KEY_W; + case Keyboard.KEY_X -> GLFW.GLFW_KEY_X; + case Keyboard.KEY_Y -> GLFW.GLFW_KEY_Y; + case Keyboard.KEY_Z -> GLFW.GLFW_KEY_Z; + case Keyboard.KEY_UP -> GLFW.GLFW_KEY_UP; + case Keyboard.KEY_DOWN -> GLFW.GLFW_KEY_DOWN; + case Keyboard.KEY_LEFT -> GLFW.GLFW_KEY_LEFT; + case Keyboard.KEY_RIGHT -> GLFW.GLFW_KEY_RIGHT; + case Keyboard.KEY_INSERT -> GLFW.GLFW_KEY_INSERT; + case Keyboard.KEY_DELETE -> GLFW.GLFW_KEY_DELETE; + case Keyboard.KEY_HOME -> GLFW.GLFW_KEY_HOME; + case Keyboard.KEY_END -> GLFW.GLFW_KEY_END; + case Keyboard.KEY_PRIOR -> GLFW.GLFW_KEY_PAGE_UP; + case Keyboard.KEY_NEXT -> GLFW.GLFW_KEY_PAGE_DOWN; + case Keyboard.KEY_F1 -> GLFW.GLFW_KEY_F1; + case Keyboard.KEY_F2 -> GLFW.GLFW_KEY_F2; + case Keyboard.KEY_F3 -> GLFW.GLFW_KEY_F3; + case Keyboard.KEY_F4 -> GLFW.GLFW_KEY_F4; + case Keyboard.KEY_F5 -> GLFW.GLFW_KEY_F5; + case Keyboard.KEY_F6 -> GLFW.GLFW_KEY_F6; + case Keyboard.KEY_F7 -> GLFW.GLFW_KEY_F7; + case Keyboard.KEY_F8 -> GLFW.GLFW_KEY_F8; + case Keyboard.KEY_F9 -> GLFW.GLFW_KEY_F9; + case Keyboard.KEY_F10 -> GLFW.GLFW_KEY_F10; + case Keyboard.KEY_F11 -> GLFW.GLFW_KEY_F11; + case Keyboard.KEY_F12 -> GLFW.GLFW_KEY_F12; + case Keyboard.KEY_F13 -> GLFW.GLFW_KEY_F13; + case Keyboard.KEY_F14 -> GLFW.GLFW_KEY_F14; + case Keyboard.KEY_F15 -> GLFW.GLFW_KEY_F15; + case Keyboard.KEY_F16 -> GLFW.GLFW_KEY_F16; + case Keyboard.KEY_F17 -> GLFW.GLFW_KEY_F17; + case Keyboard.KEY_F18 -> GLFW.GLFW_KEY_F18; + case Keyboard.KEY_F19 -> GLFW.GLFW_KEY_F19; + case Keyboard.KEY_NUMPAD1 -> GLFW.GLFW_KEY_KP_1; + case Keyboard.KEY_NUMPAD2 -> GLFW.GLFW_KEY_KP_2; + case Keyboard.KEY_NUMPAD3 -> GLFW.GLFW_KEY_KP_3; + case Keyboard.KEY_NUMPAD4 -> GLFW.GLFW_KEY_KP_4; + case Keyboard.KEY_NUMPAD5 -> GLFW.GLFW_KEY_KP_5; + case Keyboard.KEY_NUMPAD6 -> GLFW.GLFW_KEY_KP_6; + case Keyboard.KEY_NUMPAD7 -> GLFW.GLFW_KEY_KP_7; + case Keyboard.KEY_NUMPAD8 -> GLFW.GLFW_KEY_KP_8; + case Keyboard.KEY_NUMPAD9 -> GLFW.GLFW_KEY_KP_9; + case Keyboard.KEY_NUMPAD0 -> GLFW.GLFW_KEY_KP_0; + case Keyboard.KEY_ADD -> GLFW.GLFW_KEY_KP_ADD; + case Keyboard.KEY_SUBTRACT -> GLFW.GLFW_KEY_KP_SUBTRACT; + case Keyboard.KEY_MULTIPLY -> GLFW.GLFW_KEY_KP_MULTIPLY; + case Keyboard.KEY_DIVIDE -> GLFW.GLFW_KEY_KP_DIVIDE; + case Keyboard.KEY_DECIMAL -> GLFW.GLFW_KEY_KP_DECIMAL; + case Keyboard.KEY_NUMPADEQUALS -> GLFW.GLFW_KEY_KP_EQUAL; + case Keyboard.KEY_NUMPADENTER -> GLFW.GLFW_KEY_KP_ENTER; + case Keyboard.KEY_NUMLOCK -> GLFW.GLFW_KEY_NUM_LOCK; + case Keyboard.KEY_SEMICOLON -> GLFW.GLFW_KEY_SEMICOLON; + case Keyboard.KEY_BACKSLASH -> GLFW.GLFW_KEY_BACKSLASH; + case Keyboard.KEY_COMMA -> GLFW.GLFW_KEY_COMMA; + case Keyboard.KEY_PERIOD -> GLFW.GLFW_KEY_PERIOD; + case Keyboard.KEY_SLASH -> GLFW.GLFW_KEY_SLASH; + case Keyboard.KEY_GRAVE -> GLFW.GLFW_KEY_GRAVE_ACCENT; + case Keyboard.KEY_CAPITAL -> GLFW.GLFW_KEY_CAPS_LOCK; + case Keyboard.KEY_SCROLL -> GLFW.GLFW_KEY_SCROLL_LOCK; + case Keyboard.KEY_PAUSE -> GLFW.GLFW_KEY_PAUSE; + case Keyboard.KEY_CIRCUMFLEX -> GLFW.GLFW_KEY_WORLD_1; // TODO not sure if correct - case Keyboard.KEY_LCONTROL: - return GLFW.GLFW_KEY_LEFT_CONTROL; - case Keyboard.KEY_LSHIFT: - return GLFW.GLFW_KEY_LEFT_SHIFT; - case Keyboard.KEY_LMENU: - return GLFW.GLFW_KEY_LEFT_ALT; - case Keyboard.KEY_LMETA: - return GLFW.GLFW_KEY_LEFT_SUPER; + case Keyboard.KEY_MINUS -> GLFW.GLFW_KEY_MINUS; + case Keyboard.KEY_EQUALS -> GLFW.GLFW_KEY_EQUAL; + case Keyboard.KEY_LBRACKET -> GLFW.GLFW_KEY_LEFT_BRACKET; + case Keyboard.KEY_RBRACKET -> GLFW.GLFW_KEY_RIGHT_BRACKET; + case Keyboard.KEY_APOSTROPHE -> GLFW.GLFW_KEY_APOSTROPHE; + // public static final int KEY_AT = 0x91; /* (NEC PC98) */ + // public static final int KEY_COLON = 0x92; /* (NEC PC98) */ + // public static final int KEY_UNDERLINE = 0x93; /* (NEC PC98) */ - case Keyboard.KEY_RCONTROL: - return GLFW.GLFW_KEY_RIGHT_CONTROL; - case Keyboard.KEY_RSHIFT: - return GLFW.GLFW_KEY_RIGHT_SHIFT; - case Keyboard.KEY_RMENU: - return GLFW.GLFW_KEY_RIGHT_ALT; - case Keyboard.KEY_RMETA: - return GLFW.GLFW_KEY_RIGHT_SUPER; + // public static final int KEY_KANA = 0x70; /* (Japanese keyboard) */ + // public static final int KEY_CONVERT = 0x79; /* (Japanese keyboard) */ + // public static final int KEY_NOCONVERT = 0x7B; /* (Japanese keyboard) */ + // public static final int KEY_YEN = 0x7D; /* (Japanese keyboard) */ - case Keyboard.KEY_1: - return GLFW.GLFW_KEY_1; - case Keyboard.KEY_2: - return GLFW.GLFW_KEY_2; - case Keyboard.KEY_3: - return GLFW.GLFW_KEY_3; - case Keyboard.KEY_4: - return GLFW.GLFW_KEY_4; - case Keyboard.KEY_5: - return GLFW.GLFW_KEY_5; - case Keyboard.KEY_6: - return GLFW.GLFW_KEY_6; - case Keyboard.KEY_7: - return GLFW.GLFW_KEY_7; - case Keyboard.KEY_8: - return GLFW.GLFW_KEY_8; - case Keyboard.KEY_9: - return GLFW.GLFW_KEY_9; - case Keyboard.KEY_0: - return GLFW.GLFW_KEY_0; + // public static final int KEY_CIRCUMFLEX = 0x90; /* (Japanese keyboard) */ + // public static final int KEY_KANJI = 0x94; /* (Japanese keyboard) */ + // public static final int KEY_STOP = 0x95; /* (NEC PC98) */ + // public static final int KEY_AX = 0x96; /* (Japan AX) */ + // public static final int KEY_UNLABELED = 0x97; /* (J3100) */ + // public static final int KEY_SECTION = 0xA7; /* Section symbol (Mac) */ + // public static final int KEY_NUMPADCOMMA = 0xB3; /* , on numeric keypad (NEC PC98) */ + // public static final int KEY_SYSRQ = 0xB7; + // public static final int KEY_FUNCTION = 0xC4; /* Function (Mac) */ - case Keyboard.KEY_A: - return GLFW.GLFW_KEY_A; - case Keyboard.KEY_B: - return GLFW.GLFW_KEY_B; - case Keyboard.KEY_C: - return GLFW.GLFW_KEY_C; - case Keyboard.KEY_D: - return GLFW.GLFW_KEY_D; - case Keyboard.KEY_E: - return GLFW.GLFW_KEY_E; - case Keyboard.KEY_F: - return GLFW.GLFW_KEY_F; - case Keyboard.KEY_G: - return GLFW.GLFW_KEY_G; - case Keyboard.KEY_H: - return GLFW.GLFW_KEY_H; - case Keyboard.KEY_I: - return GLFW.GLFW_KEY_I; - case Keyboard.KEY_J: - return GLFW.GLFW_KEY_J; - case Keyboard.KEY_K: - return GLFW.GLFW_KEY_K; - case Keyboard.KEY_L: - return GLFW.GLFW_KEY_L; - case Keyboard.KEY_M: - return GLFW.GLFW_KEY_M; - case Keyboard.KEY_N: - return GLFW.GLFW_KEY_N; - case Keyboard.KEY_O: - return GLFW.GLFW_KEY_O; - case Keyboard.KEY_P: - return GLFW.GLFW_KEY_P; - case Keyboard.KEY_Q: - return GLFW.GLFW_KEY_Q; - case Keyboard.KEY_R: - return GLFW.GLFW_KEY_R; - case Keyboard.KEY_S: - return GLFW.GLFW_KEY_S; - case Keyboard.KEY_T: - return GLFW.GLFW_KEY_T; - case Keyboard.KEY_U: - return GLFW.GLFW_KEY_U; - case Keyboard.KEY_V: - return GLFW.GLFW_KEY_V; - case Keyboard.KEY_W: - return GLFW.GLFW_KEY_W; - case Keyboard.KEY_X: - return GLFW.GLFW_KEY_X; - case Keyboard.KEY_Y: - return GLFW.GLFW_KEY_Y; - case Keyboard.KEY_Z: - return GLFW.GLFW_KEY_Z; + // public static final int KEY_CLEAR = 0xDA; /* Clear key (Mac) */ - case Keyboard.KEY_UP: - return GLFW.GLFW_KEY_UP; - case Keyboard.KEY_DOWN: - return GLFW.GLFW_KEY_DOWN; - case Keyboard.KEY_LEFT: - return GLFW.GLFW_KEY_LEFT; - case Keyboard.KEY_RIGHT: - return GLFW.GLFW_KEY_RIGHT; + // public static final int KEY_APPS = 0xDD; /* AppMenu key */ + // public static final int KEY_POWER = 0xDE; + // public static final int KEY_SLEEP = 0xDF; - case Keyboard.KEY_INSERT: - return GLFW.GLFW_KEY_INSERT; - case Keyboard.KEY_DELETE: - return GLFW.GLFW_KEY_DELETE; - case Keyboard.KEY_HOME: - return GLFW.GLFW_KEY_HOME; - case Keyboard.KEY_END: - return GLFW.GLFW_KEY_END; - case Keyboard.KEY_PRIOR: - return GLFW.GLFW_KEY_PAGE_UP; - case Keyboard.KEY_NEXT: - return GLFW.GLFW_KEY_PAGE_DOWN; - - case Keyboard.KEY_F1: - return GLFW.GLFW_KEY_F1; - case Keyboard.KEY_F2: - return GLFW.GLFW_KEY_F2; - case Keyboard.KEY_F3: - return GLFW.GLFW_KEY_F3; - case Keyboard.KEY_F4: - return GLFW.GLFW_KEY_F4; - case Keyboard.KEY_F5: - return GLFW.GLFW_KEY_F5; - case Keyboard.KEY_F6: - return GLFW.GLFW_KEY_F6; - case Keyboard.KEY_F7: - return GLFW.GLFW_KEY_F7; - case Keyboard.KEY_F8: - return GLFW.GLFW_KEY_F8; - case Keyboard.KEY_F9: - return GLFW.GLFW_KEY_F9; - case Keyboard.KEY_F10: - return GLFW.GLFW_KEY_F10; - case Keyboard.KEY_F11: - return GLFW.GLFW_KEY_F11; - case Keyboard.KEY_F12: - return GLFW.GLFW_KEY_F12; - case Keyboard.KEY_F13: - return GLFW.GLFW_KEY_F13; - case Keyboard.KEY_F14: - return GLFW.GLFW_KEY_F14; - case Keyboard.KEY_F15: - return GLFW.GLFW_KEY_F15; - case Keyboard.KEY_F16: - return GLFW.GLFW_KEY_F16; - case Keyboard.KEY_F17: - return GLFW.GLFW_KEY_F17; - case Keyboard.KEY_F18: - return GLFW.GLFW_KEY_F18; - case Keyboard.KEY_F19: - return GLFW.GLFW_KEY_F19; - - case Keyboard.KEY_NUMPAD1: - return GLFW.GLFW_KEY_KP_1; - case Keyboard.KEY_NUMPAD2: - return GLFW.GLFW_KEY_KP_2; - case Keyboard.KEY_NUMPAD3: - return GLFW.GLFW_KEY_KP_3; - case Keyboard.KEY_NUMPAD4: - return GLFW.GLFW_KEY_KP_4; - case Keyboard.KEY_NUMPAD5: - return GLFW.GLFW_KEY_KP_5; - case Keyboard.KEY_NUMPAD6: - return GLFW.GLFW_KEY_KP_6; - case Keyboard.KEY_NUMPAD7: - return GLFW.GLFW_KEY_KP_7; - case Keyboard.KEY_NUMPAD8: - return GLFW.GLFW_KEY_KP_8; - case Keyboard.KEY_NUMPAD9: - return GLFW.GLFW_KEY_KP_9; - case Keyboard.KEY_NUMPAD0: - return GLFW.GLFW_KEY_KP_0; - - case Keyboard.KEY_ADD: - return GLFW.GLFW_KEY_KP_ADD; - case Keyboard.KEY_SUBTRACT: - return GLFW.GLFW_KEY_KP_SUBTRACT; - case Keyboard.KEY_MULTIPLY: - return GLFW.GLFW_KEY_KP_MULTIPLY; - case Keyboard.KEY_DIVIDE: - return GLFW.GLFW_KEY_KP_DIVIDE; - case Keyboard.KEY_DECIMAL: - return GLFW.GLFW_KEY_KP_DECIMAL; - case Keyboard.KEY_NUMPADEQUALS: - return GLFW.GLFW_KEY_KP_EQUAL; - case Keyboard.KEY_NUMPADENTER: - return GLFW.GLFW_KEY_KP_ENTER; - case Keyboard.KEY_NUMLOCK: - return GLFW.GLFW_KEY_NUM_LOCK; - - case Keyboard.KEY_SEMICOLON: - return GLFW.GLFW_KEY_SEMICOLON; - case Keyboard.KEY_BACKSLASH: - return GLFW.GLFW_KEY_BACKSLASH; - case Keyboard.KEY_COMMA: - return GLFW.GLFW_KEY_COMMA; - case Keyboard.KEY_PERIOD: - return GLFW.GLFW_KEY_PERIOD; - case Keyboard.KEY_SLASH: - return GLFW.GLFW_KEY_SLASH; - case Keyboard.KEY_GRAVE: - return GLFW.GLFW_KEY_GRAVE_ACCENT; - - case Keyboard.KEY_CAPITAL: - return GLFW.GLFW_KEY_CAPS_LOCK; - case Keyboard.KEY_SCROLL: - return GLFW.GLFW_KEY_SCROLL_LOCK; - - case Keyboard.KEY_PAUSE: - return GLFW.GLFW_KEY_PAUSE; - case Keyboard.KEY_CIRCUMFLEX: - return GLFW.GLFW_KEY_WORLD_1; // TODO not sure if correct - - case Keyboard.KEY_MINUS: - return GLFW.GLFW_KEY_MINUS; - case Keyboard.KEY_EQUALS: - return GLFW.GLFW_KEY_EQUAL; - case Keyboard.KEY_LBRACKET: - return GLFW.GLFW_KEY_LEFT_BRACKET; - case Keyboard.KEY_RBRACKET: - return GLFW.GLFW_KEY_RIGHT_BRACKET; - case Keyboard.KEY_APOSTROPHE: - return GLFW.GLFW_KEY_APOSTROPHE; - // public static final int KEY_AT = 0x91; /* (NEC PC98) */ - // public static final int KEY_COLON = 0x92; /* (NEC PC98) */ - // public static final int KEY_UNDERLINE = 0x93; /* (NEC PC98) */ - - // public static final int KEY_KANA = 0x70; /* (Japanese keyboard) */ - // public static final int KEY_CONVERT = 0x79; /* (Japanese keyboard) */ - // public static final int KEY_NOCONVERT = 0x7B; /* (Japanese keyboard) */ - // public static final int KEY_YEN = 0x7D; /* (Japanese keyboard) */ - - // public static final int KEY_CIRCUMFLEX = 0x90; /* (Japanese keyboard) */ - // public static final int KEY_KANJI = 0x94; /* (Japanese keyboard) */ - // public static final int KEY_STOP = 0x95; /* (NEC PC98) */ - // public static final int KEY_AX = 0x96; /* (Japan AX) */ - // public static final int KEY_UNLABELED = 0x97; /* (J3100) */ - // public static final int KEY_SECTION = 0xA7; /* Section symbol (Mac) */ - // public static final int KEY_NUMPADCOMMA = 0xB3; /* , on numeric keypad (NEC PC98) */ - // public static final int KEY_SYSRQ = 0xB7; - // public static final int KEY_FUNCTION = 0xC4; /* Function (Mac) */ - - // public static final int KEY_CLEAR = 0xDA; /* Clear key (Mac) */ - - // public static final int KEY_APPS = 0xDD; /* AppMenu key */ - // public static final int KEY_POWER = 0xDE; - // public static final int KEY_SLEEP = 0xDF; - - default: - return GLFW.GLFW_KEY_UNKNOWN; - } + default -> GLFW.GLFW_KEY_UNKNOWN; + }; } } diff --git a/src/main/java/org/lwjglx/input/Keyboard.java b/src/main/java/org/lwjglx/input/Keyboard.java index 95e38bb..ca2a978 100644 --- a/src/main/java/org/lwjglx/input/Keyboard.java +++ b/src/main/java/org/lwjglx/input/Keyboard.java @@ -227,21 +227,15 @@ public class Keyboard { public static void addGlfwKeyEvent(long window, int key, int scancode, int action, int mods) { final KeyState state; switch (action) { - case GLFW.GLFW_PRESS: - state = KeyState.PRESS; - break; - case GLFW.GLFW_RELEASE: - state = KeyState.RELEASE; - break; - case GLFW.GLFW_REPEAT: + case GLFW.GLFW_PRESS -> state = KeyState.PRESS; + case GLFW.GLFW_RELEASE -> state = KeyState.RELEASE; + case GLFW.GLFW_REPEAT -> { state = KeyState.REPEAT; if (!doRepeatEvents) { return; } - break; - default: - state = KeyState.RELEASE; - break; + } + default -> state = KeyState.RELEASE; } keyEvents[queue.getNextPos()] = KeyCodes.toLwjglKey(key); keyEventStates[queue.getNextPos()] = state; diff --git a/src/main/java/org/lwjglx/openal/EFXUtil.java b/src/main/java/org/lwjglx/openal/EFXUtil.java index 14fbe3e..e3c6c51 100644 --- a/src/main/java/org/lwjglx/openal/EFXUtil.java +++ b/src/main/java/org/lwjglx/openal/EFXUtil.java @@ -133,16 +133,11 @@ public final class EFXUtil { int genError; int testObject = 0; try { - switch (objectType) { // Create object based on type - case EFFECT: - testObject = alGenEffects(); - break; - case FILTER: - testObject = alGenFilters(); - break; - default: - throw new IllegalArgumentException("Invalid objectType: " + objectType); - } + testObject = switch (objectType) { // Create object based on type + case EFFECT -> alGenEffects(); + case FILTER -> alGenFilters(); + default -> throw new IllegalArgumentException("Invalid objectType: " + objectType); + }; genError = alGetError(); } catch (OpenALException debugBuildException) { // Hack because OpenALException hides the original error code (short of parsing the @@ -160,14 +155,9 @@ public final class EFXUtil { int setError; try { switch (objectType) { // Set based on object type - case EFFECT: - alEffecti(testObject, AL_EFFECT_TYPE, typeValue); - break; - case FILTER: - alFilteri(testObject, AL_FILTER_TYPE, typeValue); - break; - default: - throw new IllegalArgumentException("Invalid objectType: " + objectType); + case EFFECT -> alEffecti(testObject, AL_EFFECT_TYPE, typeValue); + case FILTER -> alFilteri(testObject, AL_FILTER_TYPE, typeValue); + default -> throw new IllegalArgumentException("Invalid objectType: " + objectType); } setError = alGetError(); } catch (OpenALException debugBuildException) { @@ -183,14 +173,9 @@ public final class EFXUtil { // Cleanup try { switch (objectType) { // Set based on object type - case EFFECT: - alDeleteEffects(testObject); - break; - case FILTER: - alDeleteFilters(testObject); - break; - default: - throw new IllegalArgumentException("Invalid objectType: " + objectType); + case EFFECT -> alDeleteEffects(testObject); + case FILTER -> alDeleteFilters(testObject); + default -> throw new IllegalArgumentException("Invalid objectType: " + objectType); } } catch (OpenALException debugBuildException) { // Don't care about cleanup errors. diff --git a/src/main/java/org/lwjglx/opengl/Util.java b/src/main/java/org/lwjglx/opengl/Util.java index b34495c..817ea9c 100644 --- a/src/main/java/org/lwjglx/opengl/Util.java +++ b/src/main/java/org/lwjglx/opengl/Util.java @@ -56,27 +56,17 @@ public final class Util { * Translate a GL error code to a String describing the error */ public static String translateGLErrorString(int error_code) { - switch (error_code) { - case GL_NO_ERROR: - return "No error"; - case GL_INVALID_ENUM: - return "Invalid enum"; - case GL_INVALID_VALUE: - return "Invalid value"; - case GL_INVALID_OPERATION: - return "Invalid operation"; - case GL_STACK_OVERFLOW: - return "Stack overflow"; - case GL_STACK_UNDERFLOW: - return "Stack underflow"; - case GL_OUT_OF_MEMORY: - return "Out of memory"; - case GL_TABLE_TOO_LARGE: - return "Table too large"; - case GL_INVALID_FRAMEBUFFER_OPERATION: - return "Invalid framebuffer operation"; - default: - return null; - } + return switch (error_code) { + case GL_NO_ERROR -> "No error"; + case GL_INVALID_ENUM -> "Invalid enum"; + case GL_INVALID_VALUE -> "Invalid value"; + case GL_INVALID_OPERATION -> "Invalid operation"; + case GL_STACK_OVERFLOW -> "Stack overflow"; + case GL_STACK_UNDERFLOW -> "Stack underflow"; + case GL_OUT_OF_MEMORY -> "Out of memory"; + case GL_TABLE_TOO_LARGE -> "Table too large"; + case GL_INVALID_FRAMEBUFFER_OPERATION -> "Invalid framebuffer operation"; + default -> null; + }; } } diff --git a/src/main/java/org/lwjglx/test/spaceinvaders/Game.java b/src/main/java/org/lwjglx/test/spaceinvaders/Game.java index 0f46441..d170234 100644 --- a/src/main/java/org/lwjglx/test/spaceinvaders/Game.java +++ b/src/main/java/org/lwjglx/test/spaceinvaders/Game.java @@ -547,17 +547,12 @@ public class Game { * @return */ private boolean hasInput(int direction) { - switch (direction) { - case Keyboard.KEY_LEFT: - return Keyboard.isKeyDown(Keyboard.KEY_LEFT) || mouseX < 0; - - case Keyboard.KEY_RIGHT: - return Keyboard.isKeyDown(Keyboard.KEY_RIGHT) || mouseX > 0; - - case Keyboard.KEY_SPACE: - return Keyboard.isKeyDown(Keyboard.KEY_SPACE) || Mouse.isButtonDown(0); - } - return false; + return switch (direction) { + case Keyboard.KEY_LEFT -> Keyboard.isKeyDown(Keyboard.KEY_LEFT) || mouseX < 0; + case Keyboard.KEY_RIGHT -> Keyboard.isKeyDown(Keyboard.KEY_RIGHT) || mouseX > 0; + case Keyboard.KEY_SPACE -> Keyboard.isKeyDown(Keyboard.KEY_SPACE) || Mouse.isButtonDown(0); + default -> false; + }; } /** diff --git a/src/main/java/org/lwjglx/util/Color.java b/src/main/java/org/lwjglx/util/Color.java index d2e690b..721c5f0 100644 --- a/src/main/java/org/lwjglx/util/Color.java +++ b/src/main/java/org/lwjglx/util/Color.java @@ -410,36 +410,36 @@ public final class Color implements ReadableColor, Serializable, WritableColor { float f6 = brightness * (1.0F - saturation * f4); float f7 = brightness * (1.0F - saturation * (1.0F - f4)); switch ((int) f3) { - case 0: + case 0 -> { red = (byte) (brightness * 255F + 0.5F); green = (byte) (f7 * 255F + 0.5F); blue = (byte) (f5 * 255F + 0.5F); - break; - case 1: + } + case 1 -> { red = (byte) (f6 * 255F + 0.5F); green = (byte) (brightness * 255F + 0.5F); blue = (byte) (f5 * 255F + 0.5F); - break; - case 2: + } + case 2 -> { red = (byte) (f5 * 255F + 0.5F); green = (byte) (brightness * 255F + 0.5F); blue = (byte) (f7 * 255F + 0.5F); - break; - case 3: + } + case 3 -> { red = (byte) (f5 * 255F + 0.5F); green = (byte) (f6 * 255F + 0.5F); blue = (byte) (brightness * 255F + 0.5F); - break; - case 4: + } + case 4 -> { red = (byte) (f7 * 255F + 0.5F); green = (byte) (f5 * 255F + 0.5F); blue = (byte) (brightness * 255F + 0.5F); - break; - case 5: + } + case 5 -> { red = (byte) (brightness * 255F + 0.5F); green = (byte) (f5 * 255F + 0.5F); blue = (byte) (f6 * 255F + 0.5F); - break; + } } } } diff --git a/src/main/java/org/lwjglx/util/glu/Disk.java b/src/main/java/org/lwjglx/util/glu/Disk.java index a123c08..95fefef 100644 --- a/src/main/java/org/lwjglx/util/glu/Disk.java +++ b/src/main/java/org/lwjglx/util/glu/Disk.java @@ -84,7 +84,7 @@ public class Disk extends Quadric { dr = (outerRadius - innerRadius) / loops; switch (super.drawStyle) { - case GLU_FILL: { + case GLU_FILL -> { /* texture of a gluDisk is a cut out of the texture unit square * x, y in [-outerRadius, +outerRadius]; s, t in [0, 1] * (linear mapping) @@ -128,9 +128,8 @@ public class Disk extends Quadric { } r1 = r2; } - break; } - case GLU_LINE: { + case GLU_LINE -> { int l, s; /* draw loops */ for (l = 0; l <= loops; l++) { @@ -154,9 +153,8 @@ public class Disk extends Quadric { } glEnd(); } - break; } - case GLU_POINT: { + case GLU_POINT -> { int s; glBegin(GL_POINTS); for (s = 0; s < slices; s++) { @@ -170,9 +168,8 @@ public class Disk extends Quadric { } } glEnd(); - break; } - case GLU_SILHOUETTE: { + case GLU_SILHOUETTE -> { if (innerRadius != 0.0) { float a; glBegin(GL_LINE_LOOP); @@ -193,10 +190,10 @@ public class Disk extends Quadric { } glEnd(); } - break; } - default: + default -> { return; + } } } } diff --git a/src/main/java/org/lwjglx/util/glu/GLU.java b/src/main/java/org/lwjglx/util/glu/GLU.java index 7451ea4..fffe920 100644 --- a/src/main/java/org/lwjglx/util/glu/GLU.java +++ b/src/main/java/org/lwjglx/util/glu/GLU.java @@ -395,16 +395,12 @@ public class GLU { } public static String gluErrorString(int error_code) { - switch (error_code) { - case GLU_INVALID_ENUM: - return "Invalid enum (glu)"; - case GLU_INVALID_VALUE: - return "Invalid value (glu)"; - case GLU_OUT_OF_MEMORY: - return "Out of memory (glu)"; - default: - return Util.translateGLErrorString(error_code); - } + return switch (error_code) { + case GLU_INVALID_ENUM -> "Invalid enum (glu)"; + case GLU_INVALID_VALUE -> "Invalid value (glu)"; + case GLU_OUT_OF_MEMORY -> "Out of memory (glu)"; + default -> Util.translateGLErrorString(error_code); + }; } public static GLUtessellator gluNewTess() { diff --git a/src/main/java/org/lwjglx/util/glu/MipMap.java b/src/main/java/org/lwjglx/util/glu/MipMap.java index 1029dd5..77abaff 100644 --- a/src/main/java/org/lwjglx/util/glu/MipMap.java +++ b/src/main/java/org/lwjglx/util/glu/MipMap.java @@ -169,38 +169,39 @@ public class MipMap extends Util { // Determine bytes per input type switch (typein) { - case GL_UNSIGNED_BYTE: + case GL_UNSIGNED_BYTE -> { if (!stbir_resize_uint8_srgb( - dataIn, - widthIn, - heightIn, - strideIn, - dataOut, - widthOut, - heightOut, - strideOut, - components, - alphaIdx, - 0)) { + dataIn, + widthIn, + heightIn, + strideIn, + dataOut, + widthOut, + heightOut, + strideOut, + components, + alphaIdx, + 0)) { throw new RuntimeException("Couldn't resize image with stbir"); } - break; - case GL_FLOAT: + } + case GL_FLOAT -> { if (!stbir_resize_float( - dataIn.asFloatBuffer(), - widthIn, - heightIn, - strideIn * 4, - dataOut.asFloatBuffer(), - widthOut, - heightOut, - strideOut * 4, - components)) { + dataIn.asFloatBuffer(), + widthIn, + heightIn, + strideIn * 4, + dataOut.asFloatBuffer(), + widthOut, + heightOut, + strideOut * 4, + components)) { throw new RuntimeException("Couldn't resize image with stbir"); } - break; - default: + } + default -> { return GL_INVALID_ENUM; + } } return 0; diff --git a/src/main/java/org/lwjglx/util/glu/PartialDisk.java b/src/main/java/org/lwjglx/util/glu/PartialDisk.java index 41fcff3..f6ac559 100644 --- a/src/main/java/org/lwjglx/util/glu/PartialDisk.java +++ b/src/main/java/org/lwjglx/util/glu/PartialDisk.java @@ -142,7 +142,7 @@ public class PartialDisk extends Quadric { } switch (super.drawStyle) { - case GLU_FILL: + case GLU_FILL -> { if (innerRadius == .0f) { finish = loops - 1; /* Triangle strip for inner polygons */ @@ -209,8 +209,8 @@ public class PartialDisk extends Quadric { } glEnd(); } - break; - case GLU_POINT: + } + case GLU_POINT -> { glBegin(GL_POINTS); for (i = 0; i < slices2; i++) { sintemp = sinCache[i]; @@ -227,8 +227,8 @@ public class PartialDisk extends Quadric { } } glEnd(); - break; - case GLU_LINE: + } + case GLU_LINE -> { if (innerRadius == outerRadius) { glBegin(GL_LINE_STRIP); @@ -273,8 +273,8 @@ public class PartialDisk extends Quadric { } glEnd(); } - break; - case GLU_SILHOUETTE: + } + case GLU_SILHOUETTE -> { if (sweepAngle < 360.0f) { for (i = 0; i <= slices; i += slices) { sintemp = sinCache[i]; @@ -308,9 +308,9 @@ public class PartialDisk extends Quadric { glEnd(); if (innerRadius == outerRadius) break; } - break; - default: - break; + } + default -> { + } } } } diff --git a/src/main/java/org/lwjglx/util/glu/Util.java b/src/main/java/org/lwjglx/util/glu/Util.java index 487eec3..498fc30 100644 --- a/src/main/java/org/lwjglx/util/glu/Util.java +++ b/src/main/java/org/lwjglx/util/glu/Util.java @@ -108,27 +108,14 @@ public class Util { */ protected static int compPerPix(int format) { /* Determine number of components per pixel */ - switch (format) { - case GL_COLOR_INDEX: - case GL_STENCIL_INDEX: - case GL_DEPTH_COMPONENT: - case GL_RED: - case GL_GREEN: - case GL_BLUE: - case GL_ALPHA: - case GL_LUMINANCE: - return 1; - case GL_LUMINANCE_ALPHA: - return 2; - case GL_RGB: - case GL_BGR: - return 3; - case GL_RGBA: - case GL_BGRA: - return 4; - default: - return -1; - } + return switch (format) { + case GL_COLOR_INDEX, GL_STENCIL_INDEX, GL_DEPTH_COMPONENT, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE -> + 1; + case GL_LUMINANCE_ALPHA -> 2; + case GL_RGB, GL_BGR -> 3; + case GL_RGBA, GL_BGRA -> 4; + default -> -1; + }; } /** @@ -136,17 +123,12 @@ public class Util { * @return Index of the alpha channel, or -1 if not found */ protected static int formatAlphaIndex(int format) { - switch (format) { - case GL_ALPHA: - return 0; - case GL_LUMINANCE_ALPHA: - return 1; - case GL_RGBA: - case GL_BGRA: - return 3; - default: - return -1; - } + return switch (format) { + case GL_ALPHA -> 0; + case GL_LUMINANCE_ALPHA -> 1; + case GL_RGBA, GL_BGRA -> 3; + default -> -1; + }; } /** @@ -188,60 +170,26 @@ public class Util { protected static int bytesPerPixel(int format, int type) { int n, m; - switch (format) { - case GL_COLOR_INDEX: - case GL_STENCIL_INDEX: - case GL_DEPTH_COMPONENT: - case GL_RED: - case GL_GREEN: - case GL_BLUE: - case GL_ALPHA: - case GL_LUMINANCE: - n = 1; - break; - case GL_LUMINANCE_ALPHA: - n = 2; - break; - case GL_RGB: - case GL_BGR: - n = 3; - break; - case GL_RGBA: - case GL_BGRA: - n = 4; - break; - default: - n = 0; - } + n = switch (format) { + case GL_COLOR_INDEX, GL_STENCIL_INDEX, GL_DEPTH_COMPONENT, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE -> + 1; + case GL_LUMINANCE_ALPHA -> 2; + case GL_RGB, GL_BGR -> 3; + case GL_RGBA, GL_BGRA -> 4; + default -> 0; + }; - switch (type) { - case GL_UNSIGNED_BYTE: - m = 1; - break; - case GL_BYTE: - m = 1; - break; - case GL_BITMAP: - m = 1; - break; - case GL_UNSIGNED_SHORT: - m = 2; - break; - case GL_SHORT: - m = 2; - break; - case GL_UNSIGNED_INT: - m = 4; - break; - case GL_INT: - m = 4; - break; - case GL_FLOAT: - m = 4; - break; - default: - m = 0; - } + m = switch (type) { + case GL_UNSIGNED_BYTE -> 1; + case GL_BYTE -> 1; + case GL_BITMAP -> 1; + case GL_UNSIGNED_SHORT -> 2; + case GL_SHORT -> 2; + case GL_UNSIGNED_INT -> 4; + case GL_INT -> 4; + case GL_FLOAT -> 4; + default -> 0; + }; return n * m; } diff --git a/src/main/java/org/lwjglx/util/glu/tessellation/GLUtessellatorImpl.java b/src/main/java/org/lwjglx/util/glu/tessellation/GLUtessellatorImpl.java index 7e57ba9..01f6ad1 100644 --- a/src/main/java/org/lwjglx/util/glu/tessellation/GLUtessellatorImpl.java +++ b/src/main/java/org/lwjglx/util/glu/tessellation/GLUtessellatorImpl.java @@ -249,15 +249,12 @@ public class GLUtessellatorImpl implements GLUtessellator { if (windingRule != value) break; /* not an integer */ switch (windingRule) { - case GLU_TESS_WINDING_ODD: - case GLU_TESS_WINDING_NONZERO: - case GLU_TESS_WINDING_POSITIVE: - case GLU_TESS_WINDING_NEGATIVE: - case GLU_TESS_WINDING_ABS_GEQ_TWO: + case GLU_TESS_WINDING_ODD, GLU_TESS_WINDING_NONZERO, GLU_TESS_WINDING_POSITIVE, GLU_TESS_WINDING_NEGATIVE, GLU_TESS_WINDING_ABS_GEQ_TWO -> { this.windingRule = windingRule; return; - default: - break; + } + default -> { + } } case GLU_TESS_BOUNDARY_ONLY: @@ -274,27 +271,27 @@ public class GLUtessellatorImpl implements GLUtessellator { /* Returns tessellator property */ public void gluGetTessProperty(int which, double[] value, int value_offset) { switch (which) { - case GLU_TESS_TOLERANCE: + case GLU_TESS_TOLERANCE -> { /* tolerance should be in range [0..1] */ assert (0.0 <= relTolerance && relTolerance <= 1.0); value[value_offset] = relTolerance; - break; - case GLU_TESS_WINDING_RULE: + } + case GLU_TESS_WINDING_RULE -> { assert (windingRule == GLU_TESS_WINDING_ODD - || windingRule == GLU_TESS_WINDING_NONZERO - || windingRule == GLU_TESS_WINDING_POSITIVE - || windingRule == GLU_TESS_WINDING_NEGATIVE - || windingRule == GLU_TESS_WINDING_ABS_GEQ_TWO); + || windingRule == GLU_TESS_WINDING_NONZERO + || windingRule == GLU_TESS_WINDING_POSITIVE + || windingRule == GLU_TESS_WINDING_NEGATIVE + || windingRule == GLU_TESS_WINDING_ABS_GEQ_TWO); value[value_offset] = windingRule; - break; - case GLU_TESS_BOUNDARY_ONLY: + } + case GLU_TESS_BOUNDARY_ONLY -> { assert (boundaryOnly == true || boundaryOnly == false); value[value_offset] = boundaryOnly ? 1 : 0; - break; - default: + } + default -> { value[value_offset] = 0.0; callErrorOrErrorData(GLU_INVALID_ENUM); - break; + } } } /* gluGetTessProperty() */ @@ -306,56 +303,69 @@ public class GLUtessellatorImpl implements GLUtessellator { public void gluTessCallback(int which, GLUtessellatorCallback aCallback) { switch (which) { - case GLU_TESS_BEGIN: + case GLU_TESS_BEGIN -> { callBegin = aCallback == null ? NULL_CB : aCallback; return; - case GLU_TESS_BEGIN_DATA: + } + case GLU_TESS_BEGIN_DATA -> { callBeginData = aCallback == null ? NULL_CB : aCallback; return; - case GLU_TESS_EDGE_FLAG: + } + case GLU_TESS_EDGE_FLAG -> { callEdgeFlag = aCallback == null ? NULL_CB : aCallback; /* If the client wants boundary edges to be flagged, * we render everything as separate triangles (no strips or fans). */ flagBoundary = aCallback != null; return; - case GLU_TESS_EDGE_FLAG_DATA: + } + case GLU_TESS_EDGE_FLAG_DATA -> { callEdgeFlagData = callBegin = aCallback == null ? NULL_CB : aCallback; /* If the client wants boundary edges to be flagged, * we render everything as separate triangles (no strips or fans). */ flagBoundary = (aCallback != null); return; - case GLU_TESS_VERTEX: + } + case GLU_TESS_VERTEX -> { callVertex = aCallback == null ? NULL_CB : aCallback; return; - case GLU_TESS_VERTEX_DATA: + } + case GLU_TESS_VERTEX_DATA -> { callVertexData = aCallback == null ? NULL_CB : aCallback; return; - case GLU_TESS_END: + } + case GLU_TESS_END -> { callEnd = aCallback == null ? NULL_CB : aCallback; return; - case GLU_TESS_END_DATA: + } + case GLU_TESS_END_DATA -> { callEndData = aCallback == null ? NULL_CB : aCallback; return; - case GLU_TESS_ERROR: + } + case GLU_TESS_ERROR -> { callError = aCallback == null ? NULL_CB : aCallback; return; - case GLU_TESS_ERROR_DATA: + } + case GLU_TESS_ERROR_DATA -> { callErrorData = aCallback == null ? NULL_CB : aCallback; return; - case GLU_TESS_COMBINE: + } + case GLU_TESS_COMBINE -> { callCombine = aCallback == null ? NULL_CB : aCallback; return; - case GLU_TESS_COMBINE_DATA: + } + case GLU_TESS_COMBINE_DATA -> { callCombineData = aCallback == null ? NULL_CB : aCallback; return; - // case GLU_TESS_MESH: - // callMesh = aCallback == null ? NULL_CB : aCallback; - // return; - default: + } + // case GLU_TESS_MESH: + // callMesh = aCallback == null ? NULL_CB : aCallback; + // return; + default -> { callErrorOrErrorData(GLU_INVALID_ENUM); return; + } } } diff --git a/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java b/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java index 5505814..b0b5feb 100644 --- a/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java +++ b/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java @@ -260,16 +260,21 @@ class Sweep { static boolean IsWindingInside(GLUtessellatorImpl tess, int n) { switch (tess.windingRule) { - case GLU_TESS_WINDING_ODD: + case GLU_TESS_WINDING_ODD -> { return (n & 1) != 0; - case GLU_TESS_WINDING_NONZERO: + } + case GLU_TESS_WINDING_NONZERO -> { return (n != 0); - case GLU_TESS_WINDING_POSITIVE: + } + case GLU_TESS_WINDING_POSITIVE -> { return (n > 0); - case GLU_TESS_WINDING_NEGATIVE: + } + case GLU_TESS_WINDING_NEGATIVE -> { return (n < 0); - case GLU_TESS_WINDING_ABS_GEQ_TWO: + } + case GLU_TESS_WINDING_ABS_GEQ_TWO -> { return (n >= 2) || (n <= -2); + } } /*LINTED*/ // assert (false);