cleanup
This commit is contained in:
parent
4ee489c1e6
commit
2aec5c4981
|
@ -24,7 +24,6 @@ public class Window extends BaseWindow {
|
||||||
private final Pipeline2D pipeline2D;
|
private final Pipeline2D pipeline2D;
|
||||||
private final Pipeline3D pipeline3D;
|
private final Pipeline3D pipeline3D;
|
||||||
private final Map<String, Filter> scalers;
|
private final Map<String, Filter> scalers;
|
||||||
private final Vec2i size;
|
|
||||||
private final TextureAtlas textureAtlas;
|
private final TextureAtlas textureAtlas;
|
||||||
private final long window;
|
private final long window;
|
||||||
private boolean shouldClose;
|
private boolean shouldClose;
|
||||||
|
@ -39,7 +38,6 @@ public class Window extends BaseWindow {
|
||||||
"Unable to initialize GLFW");
|
"Unable to initialize GLFW");
|
||||||
|
|
||||||
glfwDefaultWindowHints();
|
glfwDefaultWindowHints();
|
||||||
this.size = size;
|
|
||||||
windowSize = size;
|
windowSize = size;
|
||||||
|
|
||||||
|
|
||||||
|
@ -67,17 +65,14 @@ public class Window extends BaseWindow {
|
||||||
|
|
||||||
pipeline2D = new Pipeline2D(framebuffer, textureAtlas);
|
pipeline2D = new Pipeline2D(framebuffer, textureAtlas);
|
||||||
pipeline3D = new Pipeline3D(framebuffer, textureAtlas);
|
pipeline3D = new Pipeline3D(framebuffer, textureAtlas);
|
||||||
//fxaa = new FilterFXAA(framebuffer);
|
|
||||||
//scaler = new Scaler(framebuffer);
|
|
||||||
scalers = new HashMap<>();
|
scalers = new HashMap<>();
|
||||||
scalers.put("stretch", new ScalerStretch(framebuffer));
|
scalers.put("stretch", new ScalerStretch(framebuffer));
|
||||||
scalers.put("aspect", new ScalerAspect(framebuffer));
|
scalers.put("aspect", new ScalerAspect(framebuffer));
|
||||||
scalers.put("integer", new ScalerInteger(framebuffer));
|
scalers.put("integer", new ScalerInteger(framebuffer));
|
||||||
scaler = "aspect";
|
scaler = "aspect";
|
||||||
|
|
||||||
mouse = new Mouse(window, scalers.get(scaler));
|
mouse = new Mouse(window, scalers.get(scaler));
|
||||||
|
|
||||||
// = new ScalerInteger(framebuffer);
|
|
||||||
|
|
||||||
shouldClose = false;
|
shouldClose = false;
|
||||||
|
|
||||||
System.out.println("Skunkworks window initialised");
|
System.out.println("Skunkworks window initialised");
|
||||||
|
@ -150,8 +145,6 @@ public class Window extends BaseWindow {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void runScaler() {
|
public void runScaler() {
|
||||||
//fxaa.apply();
|
|
||||||
//scaler.setStretchMode(stretchMode);
|
|
||||||
scalers.get(scaler).apply();
|
scalers.get(scaler).apply();
|
||||||
scalers.get(scaler).getOutput().copyToScreen();
|
scalers.get(scaler).getOutput().copyToScreen();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue