From 4969939fdc58f19e3594690659942e586568f7e2 Mon Sep 17 00:00:00 2001 From: halotroop2288 Date: Wed, 4 Mar 2020 12:43:14 -0800 Subject: [PATCH] [Refactor] Changes for consistency part 2 (FBO is an acryonym) --- .../{FboCallbackHandler.java => FBOCallbackHandler.java} | 2 +- .../com/github/hydos/ginger/engine/common/io/Window.java | 2 +- .../engine/opengl/postprocessing/ContrastChanger.java | 4 ++-- .../engine/opengl/postprocessing/FrameBufferObject.java | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/main/java/com/github/hydos/ginger/engine/common/fbo/{FboCallbackHandler.java => FBOCallbackHandler.java} (78%) diff --git a/src/main/java/com/github/hydos/ginger/engine/common/fbo/FboCallbackHandler.java b/src/main/java/com/github/hydos/ginger/engine/common/fbo/FBOCallbackHandler.java similarity index 78% rename from src/main/java/com/github/hydos/ginger/engine/common/fbo/FboCallbackHandler.java rename to src/main/java/com/github/hydos/ginger/engine/common/fbo/FBOCallbackHandler.java index 8281895..d6bd767 100644 --- a/src/main/java/com/github/hydos/ginger/engine/common/fbo/FboCallbackHandler.java +++ b/src/main/java/com/github/hydos/ginger/engine/common/fbo/FBOCallbackHandler.java @@ -1,6 +1,6 @@ package com.github.hydos.ginger.engine.common.fbo; -public abstract class FboCallbackHandler +public abstract class FBOCallbackHandler { public void cleanUp() {} diff --git a/src/main/java/com/github/hydos/ginger/engine/common/io/Window.java b/src/main/java/com/github/hydos/ginger/engine/common/io/Window.java index 0883a2f..c6d54bb 100644 --- a/src/main/java/com/github/hydos/ginger/engine/common/io/Window.java +++ b/src/main/java/com/github/hydos/ginger/engine/common/io/Window.java @@ -48,7 +48,7 @@ public class Window static double newY = 0; public static GLCapabilities glContext; public static int actualWidth, actualHeight; - //temp stuff to test out fbo fixes + // FIXME: temp stuff to test out FBO fixes private static int oldWindowWidth = Window.getWidth(); private static int oldWindowHeight = Window.getHeight(); diff --git a/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ContrastChanger.java b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ContrastChanger.java index 1e8b5bd..e6b4abd 100644 --- a/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ContrastChanger.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ContrastChanger.java @@ -2,9 +2,9 @@ package com.github.hydos.ginger.engine.opengl.postprocessing; import org.lwjgl.opengl.*; -import com.github.hydos.ginger.engine.common.fbo.FboCallbackHandler; +import com.github.hydos.ginger.engine.common.fbo.FBOCallbackHandler; -public class ContrastChanger extends FboCallbackHandler +public class ContrastChanger extends FBOCallbackHandler { private ImageRenderer renderer; private ContrastShader shader; diff --git a/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/FrameBufferObject.java b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/FrameBufferObject.java index 357b2ac..69bd897 100644 --- a/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/FrameBufferObject.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/FrameBufferObject.java @@ -8,7 +8,7 @@ import java.nio.ByteBuffer; import org.lwjgl.glfw.*; import org.lwjgl.system.Callback; -import com.github.hydos.ginger.engine.common.fbo.FboCallbackHandler; +import com.github.hydos.ginger.engine.common.fbo.FBOCallbackHandler; import com.github.hydos.ginger.engine.common.io.Window; public class FrameBufferObject @@ -20,7 +20,7 @@ public class FrameBufferObject boolean destroyed; Object lock = new Object(); /* cool ginger feature which handles fbos once they need to be rendered */ - public FboCallbackHandler handler; + public FBOCallbackHandler handler; /* Multisampled FBO objects */ public int multisampledColorRenderBuffer; int multisampledDepthRenderBuffer; @@ -34,7 +34,7 @@ public class FrameBufferObject GLFWFramebufferSizeCallback fbCallback; Callback debugProc; - public FrameBufferObject(FboCallbackHandler handler) + public FrameBufferObject(FBOCallbackHandler handler) { this.handler = handler; this.window = Window.getWindow();