🎂 Some more fog fixes

Author: james090500

src/main/java/com/james090500/renderer/shaders/GlobalShader.java

@@ -14,8 +14,8 @@ public class GlobalShader {
         
             // calculate fog: pos is view-space or world-space RELATIVE to camera
             vec4 calcFog(vec3 pos, vec4 color) {
-                // cylindrical distance (ignore Y)
-                float horizontalDist = length(vec2(pos.x, pos.z));
+                // cylindrical distance
+                float horizontalDist = length(pos);
         
                 // subtract start distance so fog only applies after fog.start
                 float d = max(0.0, horizontalDist - fog.start);

src/main/java/com/james090500/renderer/shaders/Shader.java

@@ -1,6 +1,7 @@
 package com.james090500.renderer.shaders;
 
 import com.james090500.BlockGame;
+import com.james090500.world.Fog;
 import com.james090500.world.World;
 import org.joml.Matrix4f;
 import org.joml.Vector3f;
@@ -97,11 +98,11 @@ public void use() {
     }
 
     public void useFog() {
-        World.Fog fog = BlockGame.getInstance().getWorld().getFog();
+        Fog fog = BlockGame.getInstance().getWorld().getFog();
 
-        setVec3("fog.color", fog.color());
-        setFloat("fog.start", fog.start());
-        setFloat("fog.density", fog.density());
+        setVec3("fog.color", fog.getColor());
+        setFloat("fog.start", fog.getStart());
+        setFloat("fog.density", fog.getDensity());
     }
 
     public void stop() {

src/main/java/com/james090500/world/Fog.java

@@ -0,0 +1,24 @@
+package com.james090500.world;
+
+import com.james090500.BlockGame;
+import lombok.Getter;
+import org.joml.Vector3f;
+
+@Getter
+public class Fog {
+
+    private final Vector3f color;
+    private final float start;
+    private final float density;
+
+    public Fog(Vector3f color, float start, float density) {
+        this.color = color;
+        this.start = getFogStart(start);
+        this.density = density;
+    }
+
+    private float getFogStart(float start) {
+        int worldSize = BlockGame.getInstance().getConfig().getUserOptions().getRenderDistance().getValue();
+        return ((worldSize - 2) * 16) * start;
+    }
+}

src/main/java/com/james090500/world/World.java

@@ -31,7 +31,7 @@ public class World {
 
     private final Object2ObjectMap<ChunkPos, Chunk> chunks = new Object2ObjectOpenHashMap<>();
 
-    public record ChunkPos(int x, int y) { }
+    public record ChunkPos(int x, int y) {}
     public record ChunkOffset(int dx, int dz, int distSq) {}
 
     public final Int2ObjectOpenHashMap<Entity> entities = new Int2ObjectOpenHashMap<>();
@@ -45,8 +45,7 @@ public record ChunkOffset(int dx, int dz, int distSq) {}
     private String worldName;
 
     @Getter
-    private Fog fog = new Fog(new Vector3f(0.529f, 0.808f, 0.922f), 10f, 0.05f);
-    public record Fog(Vector3f color, float start, float density) {};
+    private Fog fog;
 
     @Getter @Setter
     private boolean remote = false;
@@ -285,6 +284,11 @@ public void update() {
         // No point looping if we aren't moving
         if(playerChunkX == player.getLastChunkX() && playerChunkZ == player.getLastChunkZ() && !this.forceUpdate) return;
 
+        // Update dynamic values
+        if(this.forceUpdate) {
+            this.fog = this.createFog();
+        }
+
         // Render chunks from players pos.
         Set<ChunkPos> requiredChunks = new HashSet<>();
         for (ChunkOffset offset : offsets) {
@@ -402,6 +406,14 @@ public Chunk loadChunk(int chunkX, int chunkZ) {
         }
     }
 
+    /**
+     * Creates fog
+     * @return The fog
+     */
+    private Fog createFog() {
+        return new Fog(new Vector3f(0.529f, 0.808f, 0.922f), 0.8f, 0.005f);
+    }
+
     /**
      * Exit the world
      */

src/main/resources/assets.txt

@@ -1,34 +1,34 @@
-fonts/Minecraftia-Regular.ttf
-gui/background.png
-gui/button.png
-gui/button_active.png
+terrain.png
 gui/button_disabled.png
+gui/background.png
 gui/logo.png
+gui/button_active.png
 gui/pack.png
+gui/button.png
 piehole_terrain.png
-sound/block/cloth1.ogg
-sound/block/cloth2.ogg
-sound/block/cloth3.ogg
+fonts/Minecraftia-Regular.ttf
+sound/gui/click.ogg
+sound/block/stone4.ogg
+sound/block/stone1.ogg
+sound/block/stone2.ogg
+sound/block/stone3.ogg
+sound/block/sand4.ogg
+sound/block/gravel3.ogg
+sound/block/gravel2.ogg
 sound/block/cloth4.ogg
 sound/block/grass1.ogg
-sound/block/grass2.ogg
 sound/block/grass3.ogg
-sound/block/grass4.ogg
 sound/block/gravel1.ogg
-sound/block/gravel2.ogg
-sound/block/gravel3.ogg
-sound/block/gravel4.ogg
-sound/block/sand1.ogg
+sound/block/grass2.ogg
 sound/block/sand2.ogg
+sound/block/cloth3.ogg
+sound/block/gravel4.ogg
+sound/block/cloth2.ogg
 sound/block/sand3.ogg
-sound/block/sand4.ogg
-sound/block/stone1.ogg
-sound/block/stone2.ogg
-sound/block/stone3.ogg
-sound/block/stone4.ogg
-sound/block/wood1.ogg
-sound/block/wood2.ogg
+sound/block/sand1.ogg
+sound/block/cloth1.ogg
+sound/block/grass4.ogg
 sound/block/wood3.ogg
-sound/block/wood4.ogg
-sound/gui/click.ogg
-terrain.png
+sound/block/wood2.ogg
+sound/block/wood1.ogg
+sound/block/wood4.ogg