diff --git a/src/main/java/io/github/hydos/ginger/engine/postProcessing/Fbo.java b/src/main/java/io/github/hydos/ginger/engine/postProcessing/Fbo.java index 5a282b5..37fca34 100644 --- a/src/main/java/io/github/hydos/ginger/engine/postProcessing/Fbo.java +++ b/src/main/java/io/github/hydos/ginger/engine/postProcessing/Fbo.java @@ -60,7 +60,6 @@ public class Fbo { * rendered after this will be rendered to this FBO, and not to the screen. */ public void bindFrameBuffer() { - GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0); GL30.glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, frameBuffer); GL11.glViewport(0, 0, Window.width, Window.height); } diff --git a/src/main/java/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.java b/src/main/java/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.java index 35d66ca..eb41684 100644 --- a/src/main/java/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.java +++ b/src/main/java/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.java @@ -6,13 +6,13 @@ public class ImageRenderer { private Fbo fbo; - protected ImageRenderer(int width, int height) { + public ImageRenderer(int width, int height) { this.fbo = new Fbo(width, height, Fbo.NONE); } - protected ImageRenderer() {} + public ImageRenderer() {} - protected void renderQuad() { + public void renderQuad() { if (fbo != null) { fbo.bindFrameBuffer(); } @@ -23,11 +23,11 @@ public class ImageRenderer { } } - protected int getOutputTexture() { + public int getOutputTexture() { return fbo.getColourTexture(); } - protected void cleanUp() { + public void cleanUp() { if (fbo != null) { fbo.cleanUp(); } diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class index a121fd5..b2a75d5 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class index 9de0145..da5ac07 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 483380f..24f2279 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri May 31 16:12:50 AEST 2019 +#Sat Jun 01 11:48:01 AEST 2019 version=NIGHTLY groupId=me.hydos artifactId=ginger diff --git a/target/original-ginger-NIGHTLY.jar b/target/original-ginger-NIGHTLY.jar index f9dd152..4a9e3de 100644 Binary files a/target/original-ginger-NIGHTLY.jar and b/target/original-ginger-NIGHTLY.jar differ