From 9d7f69892b4d976ff3b9d1de7866a49756f6a81a Mon Sep 17 00:00:00 2001 From: OLEGSHA Date: Fri, 26 Mar 2021 21:57:54 +0300 Subject: [PATCH] Removed unused import and renamed VSYNC to VSync --- .../client/graphics/backend/GraphicsBackend.java | 12 ++++++------ .../client/graphics/backend/GraphicsInterface.java | 2 +- .../util/crash/providers/ScreenContextProvider.java | 1 - .../ru/windcorp/progressia/test/LayerTestGUI.java | 4 ++-- .../windcorp/progressia/test/TestPlayerControls.java | 2 +- src/main/resources/assets/languages/en-US.lang | 2 +- src/main/resources/assets/languages/ru-RU.lang | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsBackend.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsBackend.java index a6aadfb..04c4a3d 100644 --- a/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsBackend.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsBackend.java @@ -39,7 +39,7 @@ public class GraphicsBackend { private static boolean faceCullingEnabled = false; private static boolean isFullscreen = false; - private static boolean isVSYNC = false; + private static boolean vSyncEnabled = false; private static boolean isGLFWInitialized = false; private static boolean isOpenGLInitialized = false; @@ -153,8 +153,8 @@ public class GraphicsBackend { return isFullscreen; } - public static boolean isVSYNC() { - return isVSYNC; + public static boolean isVSyncEnabled() { + return vSyncEnabled; } public static void setFullscreen() { @@ -183,9 +183,9 @@ public class GraphicsBackend { isFullscreen = false; } - public static void setVSYNC(boolean state) { - glfwSwapInterval(state ? 1 : 0); - isVSYNC = state; + public static void setVSyncEnabled(boolean enable) { + glfwSwapInterval(enable ? 1 : 0); + vSyncEnabled = enable; } public static int getRefreshRate() { diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsInterface.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsInterface.java index 1fb9695..799edfd 100644 --- a/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsInterface.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsInterface.java @@ -79,7 +79,7 @@ public class GraphicsInterface { } else { GraphicsBackend.setWindowed(); } - GraphicsBackend.setVSYNC(GraphicsBackend.isVSYNC()); + GraphicsBackend.setVSyncEnabled(GraphicsBackend.isVSyncEnabled()); } } diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/ScreenContextProvider.java b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/ScreenContextProvider.java index 2b5f91c..7951e27 100644 --- a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/ScreenContextProvider.java +++ b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/ScreenContextProvider.java @@ -19,7 +19,6 @@ package ru.windcorp.progressia.common.util.crash.providers; import ru.windcorp.progressia.client.graphics.backend.GraphicsBackend; -import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface; import ru.windcorp.progressia.common.util.crash.ContextProvider; import java.util.Map; diff --git a/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java b/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java index 7c3f633..ca02ed8 100755 --- a/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java +++ b/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java @@ -121,9 +121,9 @@ public class LayerTestGUI extends GUILayer { panel.addChild( new Label( - "VSYNCDisplay", + "VSyncDisplay", font, - tmp_dynFormat("LayerTestGUI.IsVSYNC", GraphicsBackend::isVSYNC) + tmp_dynFormat("LayerTestGUI.IsVSync", GraphicsBackend::isVSyncEnabled) ) ); diff --git a/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java b/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java index 01ac685..f129255 100644 --- a/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java +++ b/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java @@ -197,7 +197,7 @@ public class TestPlayerControls { case GLFW.GLFW_KEY_F12: if (!event.isPress()) return false; - GraphicsBackend.setVSYNC(!GraphicsBackend.isVSYNC()); + GraphicsBackend.setVSyncEnabled(!GraphicsBackend.isVSyncEnabled()); updateGUI(); break; diff --git a/src/main/resources/assets/languages/en-US.lang b/src/main/resources/assets/languages/en-US.lang index a5a2341..2697fda 100644 --- a/src/main/resources/assets/languages/en-US.lang +++ b/src/main/resources/assets/languages/en-US.lang @@ -21,4 +21,4 @@ LayerTestGUI.SelectedBlockDisplay = %s Block: %s LayerTestGUI.SelectedTileDisplay = %s Tile: %s LayerTestGUI.PlacementModeHint = (Blocks %s Tiles: Ctrl + Mouse Wheel) LayerTestGUI.IsFullscreen = Fullscreen: %5s (F11) -LayerTestGUI.IsVSYNC = VSYNC: %5s (F12) \ No newline at end of file +LayerTestGUI.IsVSync = VSync: %5s (F12) \ No newline at end of file diff --git a/src/main/resources/assets/languages/ru-RU.lang b/src/main/resources/assets/languages/ru-RU.lang index a8b2645..1b67b24 100644 --- a/src/main/resources/assets/languages/ru-RU.lang +++ b/src/main/resources/assets/languages/ru-RU.lang @@ -21,4 +21,4 @@ LayerTestGUI.SelectedBlockDisplay = %s Блок: %s LayerTestGUI.SelectedTileDisplay = %s Плитка: %s LayerTestGUI.PlacementModeHint = (Блок %s плитки: Ctrl + прокрутка) LayerTestGUI.IsFullscreen = Полный экран: %5s (F11) -LayerTestGUI.IsVSYNC = Верт. синхр.: %5s (F12) \ No newline at end of file +LayerTestGUI.IsVSync = Верт. синхр.: %5s (F12) \ No newline at end of file