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

[Refactor] Changes for consistency part 2 (FBO is an acryonym)

liteCraft
Caroline Bell 2020-03-04 12:43:14 -08:00
parent 33b0cf7787
commit 4969939fdc
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/github/hydos/ginger/engine/common/fbo/FboCallbackHandler.java → src/main/java/com/github/hydos/ginger/engine/common/fbo/FBOCallbackHandler.java
View File

@ -1,6 +1,6 @@
package com.github.hydos.ginger.engine.common.fbo; package com.github.hydos.ginger.engine.common.fbo;
public abstract class FboCallbackHandler public abstract class FBOCallbackHandler
{ {
public void cleanUp() public void cleanUp()
{} {}

2
src/main/java/com/github/hydos/ginger/engine/common/io/Window.java
View File

@ -48,7 +48,7 @@ public class Window
static double newY = 0; static double newY = 0;
public static GLCapabilities glContext; public static GLCapabilities glContext;
public static int actualWidth, actualHeight; 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 oldWindowWidth = Window.getWidth();
private static int oldWindowHeight = Window.getHeight(); private static int oldWindowHeight = Window.getHeight();

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

@ -2,9 +2,9 @@ package com.github.hydos.ginger.engine.opengl.postprocessing;
import org.lwjgl.opengl.*; 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 ImageRenderer renderer;
private ContrastShader shader; private ContrastShader shader;

6
src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/FrameBufferObject.java
View File

@ -8,7 +8,7 @@ import java.nio.ByteBuffer;
import org.lwjgl.glfw.*; import org.lwjgl.glfw.*;
import org.lwjgl.system.Callback; 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; import com.github.hydos.ginger.engine.common.io.Window;
public class FrameBufferObject public class FrameBufferObject
@ -20,7 +20,7 @@ public class FrameBufferObject
boolean destroyed; boolean destroyed;
Object lock = new Object(); Object lock = new Object();
/* cool ginger feature which handles fbos once they need to be rendered */ /* cool ginger feature which handles fbos once they need to be rendered */
public FboCallbackHandler handler; public FBOCallbackHandler handler;
/* Multisampled FBO objects */ /* Multisampled FBO objects */
public int multisampledColorRenderBuffer; public int multisampledColorRenderBuffer;
int multisampledDepthRenderBuffer; int multisampledDepthRenderBuffer;
@ -34,7 +34,7 @@ public class FrameBufferObject
GLFWFramebufferSizeCallback fbCallback; GLFWFramebufferSizeCallback fbCallback;
Callback debugProc; Callback debugProc;
public FrameBufferObject(FboCallbackHandler handler) public FrameBufferObject(FBOCallbackHandler handler)
{ {
this.handler = handler; this.handler = handler;
this.window = Window.getWindow(); this.window = Window.getWindow();