last commit for today on laptop i think

pull/1/head
BuildTools 2019-06-01 12:06:44 +10:00
parent f7d6f56c50
commit c0552978b0
6 changed files with 6 additions and 7 deletions

View File

@ -60,7 +60,6 @@ public class Fbo {
* rendered after this will be rendered to this FBO, and not to the screen. * rendered after this will be rendered to this FBO, and not to the screen.
*/ */
public void bindFrameBuffer() { public void bindFrameBuffer() {
GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0);
GL30.glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, frameBuffer); GL30.glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, frameBuffer);
GL11.glViewport(0, 0, Window.width, Window.height); GL11.glViewport(0, 0, Window.width, Window.height);
} }

View File

@ -6,13 +6,13 @@ public class ImageRenderer {
private Fbo fbo; private Fbo fbo;
protected ImageRenderer(int width, int height) { public ImageRenderer(int width, int height) {
this.fbo = new Fbo(width, height, Fbo.NONE); this.fbo = new Fbo(width, height, Fbo.NONE);
} }
protected ImageRenderer() {} public ImageRenderer() {}
protected void renderQuad() { public void renderQuad() {
if (fbo != null) { if (fbo != null) {
fbo.bindFrameBuffer(); fbo.bindFrameBuffer();
} }
@ -23,11 +23,11 @@ public class ImageRenderer {
} }
} }
protected int getOutputTexture() { public int getOutputTexture() {
return fbo.getColourTexture(); return fbo.getColourTexture();
} }
protected void cleanUp() { public void cleanUp() {
if (fbo != null) { if (fbo != null) {
fbo.cleanUp(); fbo.cleanUp();
} }

View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Fri May 31 16:12:50 AEST 2019 #Sat Jun 01 11:48:01 AEST 2019
version=NIGHTLY version=NIGHTLY
groupId=me.hydos groupId=me.hydos
artifactId=ginger artifactId=ginger

Binary file not shown.