diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java index 835ffbe3..ba577478 100644 --- a/src/main/java/electrosphere/engine/Globals.java +++ b/src/main/java/electrosphere/engine/Globals.java @@ -224,6 +224,7 @@ public class Globals { public static int WINDOW_WIDTH = 1920; public static int WINDOW_HEIGHT = 1080; public static boolean WINDOW_DECORATED = true; //used to control whether the window is created with decorations or not (ie for testing) + public static boolean WINDOW_FULLSCREEN = false; //used to control whether the window is created fullscreen or not (ie for testing) //title bar dimensions public static int WINDOW_TITLE_BAR_HEIGHT = 0; diff --git a/src/main/java/electrosphere/renderer/RenderingEngine.java b/src/main/java/electrosphere/renderer/RenderingEngine.java index a4e42ce3..19edb00b 100644 --- a/src/main/java/electrosphere/renderer/RenderingEngine.java +++ b/src/main/java/electrosphere/renderer/RenderingEngine.java @@ -243,7 +243,7 @@ public class RenderingEngine { // glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE); Allows you to make the background transparent // glfwWindowHint(GLFW_OPACITY, 23); //Creates the window reference object - if(Globals.userSettings.displayFullscreen()){ + if(Globals.userSettings.displayFullscreen() || Globals.WINDOW_FULLSCREEN){ //below line is for fullscreen Globals.window = glfwCreateWindow(Globals.WINDOW_WIDTH, Globals.WINDOW_HEIGHT, "ORPG", glfwGetPrimaryMonitor(), NULL); } else { diff --git a/src/test/java/electrosphere/renderer/ui/elements/WindowTest.java b/src/test/java/electrosphere/renderer/ui/elements/WindowTest.java index ab1b83f6..313ae569 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/WindowTest.java +++ b/src/test/java/electrosphere/renderer/ui/elements/WindowTest.java @@ -1,13 +1,11 @@ package electrosphere.renderer.ui.elements; import annotations.IntegrationTest; -import electrosphere.logger.Logger; -import electrosphere.logger.LoggerInterface; -import electrosphere.logger.Logger.LogLevel; import electrosphere.menu.WindowUtils; import electrosphere.menu.mainmenu.MenuGeneratorsUITesting; import template.RenderingTestTemplate; import testutils.TestEngineUtils; +import testutils.TestRenderingUtils; /** * Tests for the window class @@ -23,9 +21,6 @@ public class WindowTest extends RenderingTestTemplate { TestEngineUtils.simulateFrames(1); WindowUtils.replaceMainMenuContents(MenuGeneratorsUITesting.createUITestMenu()); - for(Logger logger : LoggerInterface.getLoggers()){ - logger.setLevel(LogLevel.LOOP_DEBUG); - } //only simulating 1 frame after updating ui contents does not trigger re-render in local dev environment, but DOES in CI env //2 frames seems to fix this TestEngineUtils.simulateFrames(2); diff --git a/src/test/java/template/RenderingTestTemplate.java b/src/test/java/template/RenderingTestTemplate.java index 1803766f..34864079 100644 --- a/src/test/java/template/RenderingTestTemplate.java +++ b/src/test/java/template/RenderingTestTemplate.java @@ -20,6 +20,7 @@ public abstract class RenderingTestTemplate { @IntegrationSetup public void initEngine(){ Globals.WINDOW_DECORATED = false; + Globals.WINDOW_FULLSCREEN = true; Globals.WINDOW_WIDTH = 1920; Globals.WINDOW_HEIGHT = 1080; TestEngineUtils.initGraphicalEngine(); diff --git a/src/test/java/testutils/TestRenderingUtils.java b/src/test/java/testutils/TestRenderingUtils.java index 5d6b36f4..bde3e820 100644 --- a/src/test/java/testutils/TestRenderingUtils.java +++ b/src/test/java/testutils/TestRenderingUtils.java @@ -34,16 +34,23 @@ public class TestRenderingUtils { } BufferedImage screenshot = RenderingEngine.defaultFramebuffer.getPixels(Globals.renderingEngine.getOpenGLState()); //check basic data + // + //width if(testData.getWidth() != screenshot.getWidth()){ onFailure.run(); } - assertEquals(screenshot.getHeight(), testData.getHeight()); - if(testData.getWidth() != screenshot.getWidth()){ - onFailure.run(); - } - assertEquals(screenshot.getHeight(), testData.getHeight()); + assertEquals(testData.getWidth(), screenshot.getWidth()); + // + //height + if(testData.getHeight() != screenshot.getHeight()){ + onFailure.run(); + } + assertEquals(testData.getHeight(), screenshot.getHeight()); + + // //pixel-by-pixel check + // for(int x = 0; x < testData.getWidth(); x++){ for(int y = 0; y < testData.getHeight(); y++){ diff --git a/test/java/electrosphere/renderer/ui/elements/window.png b/test/java/electrosphere/renderer/ui/elements/window.png index a64d34f0..4d285b85 100644 Binary files a/test/java/electrosphere/renderer/ui/elements/window.png and b/test/java/electrosphere/renderer/ui/elements/window.png differ