diff --git a/com/danitheskunk/skunkworks/backends/gl/Window.java b/com/danitheskunk/skunkworks/backends/gl/Window.java index 96705c9..664aca1 100644 --- a/com/danitheskunk/skunkworks/backends/gl/Window.java +++ b/com/danitheskunk/skunkworks/backends/gl/Window.java @@ -24,7 +24,6 @@ public class Window extends BaseWindow { private final Pipeline2D pipeline2D; private final Pipeline3D pipeline3D; private final Map scalers; - private final Vec2i size; private final TextureAtlas textureAtlas; private final long window; private boolean shouldClose; @@ -39,7 +38,6 @@ public class Window extends BaseWindow { "Unable to initialize GLFW"); glfwDefaultWindowHints(); - this.size = size; windowSize = size; @@ -67,17 +65,14 @@ public class Window extends BaseWindow { pipeline2D = new Pipeline2D(framebuffer, textureAtlas); pipeline3D = new Pipeline3D(framebuffer, textureAtlas); - //fxaa = new FilterFXAA(framebuffer); - //scaler = new Scaler(framebuffer); + scalers = new HashMap<>(); scalers.put("stretch", new ScalerStretch(framebuffer)); scalers.put("aspect", new ScalerAspect(framebuffer)); scalers.put("integer", new ScalerInteger(framebuffer)); scaler = "aspect"; + mouse = new Mouse(window, scalers.get(scaler)); - - // = new ScalerInteger(framebuffer); - shouldClose = false; System.out.println("Skunkworks window initialised"); @@ -150,8 +145,6 @@ public class Window extends BaseWindow { @Override public void runScaler() { - //fxaa.apply(); - //scaler.setStretchMode(stretchMode); scalers.get(scaler).apply(); scalers.get(scaler).getOutput().copyToScreen(); }