From 821ef4d60fb8789fd9ee4f934ca13a0fef2b91e5 Mon Sep 17 00:00:00 2001 From: hYdos Date: Tue, 25 Feb 2020 16:09:26 +1000 Subject: [PATCH] fixed more errors --- src/main/java/com/github/hydos/ginger/engine/api/Ginger.java | 2 +- .../github/hydos/ginger/engine/fbo/FboCallbackHandler.java | 4 ++-- .../hydos/ginger/engine/postprocessing/ContrastChanger.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/hydos/ginger/engine/api/Ginger.java b/src/main/java/com/github/hydos/ginger/engine/api/Ginger.java index 04756f1..8fabe89 100644 --- a/src/main/java/com/github/hydos/ginger/engine/api/Ginger.java +++ b/src/main/java/com/github/hydos/ginger/engine/api/Ginger.java @@ -26,7 +26,7 @@ public class Ginger { public void setup(MasterRenderer masterRenderer, Game game) { gingerRegister = new GingerRegister(); gingerRegister.registerGame(game); - contrastFbo = new Fbo(); + contrastFbo = new Fbo(new ContrastChanger()); this.masterRenderer = masterRenderer; picker = new MousePicker(game.data.camera, masterRenderer.getProjectionMatrix(), null); PostProcessing.init(); diff --git a/src/main/java/com/github/hydos/ginger/engine/fbo/FboCallbackHandler.java b/src/main/java/com/github/hydos/ginger/engine/fbo/FboCallbackHandler.java index 0bdfd6c..d64f921 100644 --- a/src/main/java/com/github/hydos/ginger/engine/fbo/FboCallbackHandler.java +++ b/src/main/java/com/github/hydos/ginger/engine/fbo/FboCallbackHandler.java @@ -3,9 +3,9 @@ package com.github.hydos.ginger.engine.fbo; public abstract class FboCallbackHandler { - public abstract void render(); + public abstract void render(int texture); public void resize() {} - public void cleanup() {} + public void cleanUp() {} } diff --git a/src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastChanger.java b/src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastChanger.java index efeed30..1aa38f2 100644 --- a/src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastChanger.java +++ b/src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastChanger.java @@ -14,6 +14,7 @@ public class ContrastChanger extends FboCallbackHandler{ renderer = new ImageRenderer(); } + @Override public void render(int texture) { shader.start(); GL13.glActiveTexture(GL13.GL_TEXTURE0); @@ -22,9 +23,9 @@ public class ContrastChanger extends FboCallbackHandler{ shader.stop(); } + @Override public void cleanUp() { renderer.cleanUp(); shader.cleanUp(); } - }