And now fogubo...yea I'm just knocking these easy stuff for now.

Author: Waterpicker

src/main/java/gg/generations/rarecandy/tools/gui/GuiPipelines.java

@@ -84,11 +84,6 @@ public class GuiPipelines {
             })
             .supplyUniform("Light0_Direction", uniformUploadContext -> uniformUploadContext.uniform().uploadVec3f(light0))
             .supplyUniform("Light1_Direction", uniformUploadContext -> uniformUploadContext.uniform().uploadVec3f(light1))
-            .supplyUniform("dynamicVertexColor", ctx -> ctx.uniform().uploadBoolean(true))
-            .supplyUniform("FogShape", ctx -> ctx.uniform().uploadInt(0)) //TODO: Make enum for fog shape. I think 0 is spherical and 1 cylinderical
-            .supplyUniform("FogColor", ctx -> ctx.uniform().uploadVec4f(fogColor))
-            .supplyUniform("FogStart", ctx -> ctx.uniform().uploadFloat(20.0f))
-            .supplyUniform("FogEnd", ctx -> ctx.uniform().uploadFloat(20.0f))
             .supplyUniform("tera", ctx -> ctx.uniform().uploadBoolean(true))
             .supplyUniform("light", ctx -> {
                 var light = (int) (RareCandyCanvas.getLightLevel() * 15);

src/main/java/gg/generations/rarecandy/tools/gui/RareCandyCanvas.java

@@ -13,6 +13,7 @@
 import gg.generations.rarecandy.renderer.model.GLModel;
 import gg.generations.rarecandy.renderer.rendering.*;
 import gg.generations.rarecandy.renderer.storage.AnimatedObjectInstance;
+import gg.generations.rarecandy.renderer.ubo.UniformBlockUploader;
 import gg.generations.rarecandy.tools.TextureLoader;
 import org.jetbrains.annotations.NotNull;
 import org.joml.Matrix4f;
@@ -21,6 +22,7 @@
 import org.lwjgl.opengl.GL11C;
 import org.lwjgl.opengl.awt.AWTGLCanvas;
 import org.lwjgl.opengl.awt.GLData;
+import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.util.nfd.NativeFileDialog;
 
 import javax.swing.*;
@@ -69,6 +71,7 @@ public class RareCandyCanvas extends AWTGLCanvas {
     public static boolean renderingFrame;
     private MultiRenderObject<MeshObject> cube;
     private ObjectInstance[] cubeInstances;
+    private Fog fog;
 
     public static void setLightLevel(float lightLevel) {
         previousLightLevel = RareCandyCanvas.lightLevel;
@@ -173,6 +176,9 @@ public void initGL() {
         GuiPipelines.onInitialize();
         this.renderer = new RareCandy();
 
+        fog = new Fog();
+        fog.bind();
+
         GL11C.glClearColor(0, 0, 0, 0);
         GL11C.glEnable(GL11C.GL_DEPTH_TEST);
 
@@ -399,3 +405,18 @@ public <V extends RenderObject> void render(ObjectInstance instance) {
     }
 }
 
+class Fog extends UniformBlockUploader {
+    private final long pointer;
+    public Fog() {
+        super(Integer.BYTES + 5 * Float.BYTES, 2);
+        this.pointer = MemoryUtil.nmemAlloc(Integer.BYTES + 5 * Float.BYTES);
+
+        GuiPipelines.fogColor.getToAddress(pointer);
+        MemoryUtil.memPutFloat(pointer + 16, 0.0f);
+        MemoryUtil.memPutFloat(pointer + 20, 5.0f);
+        MemoryUtil.memPutInt(pointer + 24, 0);
+
+        upload(0, 24, pointer);
+    }
+}
+

src/main/resources/shaders/experimental/animated.fs.glsl

@@ -9,9 +9,13 @@ out vec4 outColor;
 uniform vec4 ColorModulator;
 
 //fog
-uniform float FogStart;
-uniform float FogEnd;
-uniform vec4 FogColor;
+layout(std140, binding = 2) uniform Fog {
+    vec4 FogColor;
+    float FogStart;
+    float FogEnd;
+    int FogShape;
+};
+
 
 uniform sampler2D diffuse;
 uniform sampler2D mask;

src/main/resources/shaders/experimental/animated.vs.glsl

@@ -18,8 +18,6 @@ out vec3 worldPos;
 
 uniform bool dynamicVertexColor;
 
-uniform int FogShape;
-
 uniform mat4 viewMatrix;
 uniform mat4 projectionMatrix;
 
@@ -29,6 +27,13 @@ uniform vec3 Light1_Direction;
 uniform vec2 uvOffset;
 uniform vec2 uvScale;
 
+layout(std140, binding = 2) uniform Fog {
+    vec4 FogColor;
+    float FogStart;
+    float FogEnd;
+    int FogShape;
+};
+
 layout(std140, binding = 1) uniform Instance {
     mat4 modelMatrix;
     mat4 boneTransforms[MAX_BONES];
@@ -54,8 +59,6 @@ float fog_distance(mat4 modelViewMat, vec3 pos, int shape) {
 }
 
 vec4 getVertexColor() {
-    if(dynamicVertexColor) return vec4(1);
-
     vec3 lightDir0 = normalize(Light0_Direction);
     vec3 lightDir1 = normalize(Light1_Direction);
     float light0 = max(0.0, dot(Light0_Direction, inNormal));