halotroop
/
Ginger3D
1
0
Fork 0
Code Pull Requests Packages Releases Activity

fixed more errors

pull/7/head
hYdos 2020-02-25 16:09:26 +10:00
parent f7c83d1afe
commit 821ef4d60f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/github/hydos/ginger/engine/api/Ginger.java
View File

@ -26,7 +26,7 @@ public class Ginger {
public void setup(MasterRenderer masterRenderer, Game game) { public void setup(MasterRenderer masterRenderer, Game game) {
gingerRegister = new GingerRegister(); gingerRegister = new GingerRegister();
gingerRegister.registerGame(game); gingerRegister.registerGame(game);
contrastFbo = new Fbo(); contrastFbo = new Fbo(new ContrastChanger());
this.masterRenderer = masterRenderer; this.masterRenderer = masterRenderer;
picker = new MousePicker(game.data.camera, masterRenderer.getProjectionMatrix(), null); picker = new MousePicker(game.data.camera, masterRenderer.getProjectionMatrix(), null);
PostProcessing.init(); PostProcessing.init();

4
src/main/java/com/github/hydos/ginger/engine/fbo/FboCallbackHandler.java
View File

@ -3,9 +3,9 @@ package com.github.hydos.ginger.engine.fbo;
public abstract class FboCallbackHandler public abstract class FboCallbackHandler
{ {
public abstract void render(); public abstract void render(int texture);
public void resize() {} public void resize() {}
public void cleanup() {} public void cleanUp() {}
} }

3
src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastChanger.java
View File

@ -14,6 +14,7 @@ public class ContrastChanger extends FboCallbackHandler{
renderer = new ImageRenderer(); renderer = new ImageRenderer();
} }
@Override
public void render(int texture) { public void render(int texture) {
shader.start(); shader.start();
GL13.glActiveTexture(GL13.GL_TEXTURE0); GL13.glActiveTexture(GL13.GL_TEXTURE0);
@ -22,9 +23,9 @@ public class ContrastChanger extends FboCallbackHandler{
shader.stop(); shader.stop();
} }
@Override
public void cleanUp() { public void cleanUp() {
renderer.cleanUp(); renderer.cleanUp();
shader.cleanUp(); shader.cleanUp();
} }
} }