spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove sodium extra

Browse Source
This commit is contained in:
mcrcortex
2025-12-18 14:04:35 +10:00
parent 1e4500a912
commit bca46143fb
4 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -124,7 +124,6 @@ dependencies {
//modImplementation "maven.modrinth:sodium:mc1.21.11-0.8.0-fabric" //modImplementation "maven.modrinth:sodium:mc1.21.11-0.8.0-fabric"
modImplementation "net.caffeinemc:sodium-fabric:0.8.1-SNAPSHOT+mc1.21.11+" modImplementation "net.caffeinemc:sodium-fabric:0.8.1-SNAPSHOT+mc1.21.11+"
modImplementation("maven.modrinth:lithium:mc1.21.11-0.21.0-fabric") modImplementation("maven.modrinth:lithium:mc1.21.11-0.21.0-fabric")
//modRuntimeOnlyMsk "drouarb:nvidium:0.4.1-beta4:1.21.6@jar" //modRuntimeOnlyMsk "drouarb:nvidium:0.4.1-beta4:1.21.6@jar"
@@ -140,9 +139,6 @@ dependencies {
//modCompileOnly("maven.modrinth:immersiveportals:v5.1.7-mc1.20.4") //modCompileOnly("maven.modrinth:immersiveportals:v5.1.7-mc1.20.4")
modCompileOnly("maven.modrinth:sodium-extra:mc1.21.11-0.8.0+fabric")
//modRuntimeOnlyMsk("maven.modrinth:sodium-extra:mc1.21.11-0.8.0+fabric")
modCompileOnly("maven.modrinth:chunky:1.4.54-fabric") modCompileOnly("maven.modrinth:chunky:1.4.54-fabric")
//modRuntimeOnlyMsk("maven.modrinth:chunky:1.4.40-fabric") //modRuntimeOnlyMsk("maven.modrinth:chunky:1.4.40-fabric")

18
src/main/java/me/cortex/voxy/client/compat/SodiumExtra.java
View File

@@ -1,18 +0,0 @@
package me.cortex.voxy.client.compat;
import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
import net.fabricmc.loader.api.FabricLoader;
public class SodiumExtra {
public static final boolean HAS_SODIUM_EXTRA = FabricLoader.getInstance().isModLoaded("sodium-extra");
public static boolean useSodiumExtraCulling() {
if (!HAS_SODIUM_EXTRA) {
return false;
}
return useSodiumExtraCulling0();
}
private static boolean useSodiumExtraCulling0() {
return !SodiumExtraClientMod.options().renderSettings.globalFog;
}
}

3
src/main/java/me/cortex/voxy/client/core/rendering/ChunkBoundRenderer.java
View File

@@ -2,8 +2,6 @@ package me.cortex.voxy.client.core.rendering;
import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import me.cortex.voxy.client.VoxyClient;
import me.cortex.voxy.client.compat.SodiumExtra;
import me.cortex.voxy.client.core.AbstractRenderPipeline; import me.cortex.voxy.client.core.AbstractRenderPipeline;
import me.cortex.voxy.client.core.gl.GlBuffer; import me.cortex.voxy.client.core.gl.GlBuffer;
import me.cortex.voxy.client.core.gl.GlVertexArray; import me.cortex.voxy.client.core.gl.GlVertexArray;
@@ -56,7 +54,6 @@ public class ChunkBoundRenderer {
this.rasterShader = Shader.makeAuto() this.rasterShader = Shader.makeAuto()
.addSource(ShaderType.VERTEX, vert) .addSource(ShaderType.VERTEX, vert)
.defineIf("TAA", taa != null) .defineIf("TAA", taa != null)
.defineIf("USE_SODIUM_EXTRA_CULLING", SodiumExtra.useSodiumExtraCulling())
.add(ShaderType.FRAGMENT, "voxy:chunkoutline/outline.fsh") .add(ShaderType.FRAGMENT, "voxy:chunkoutline/outline.fsh")
.compile() .compile()
.ubo(0, this.uniformBuffer) .ubo(0, this.uniformBuffer)

9
src/main/resources/assets/voxy/shaders/chunkoutline/outline.vsh
View File

@@ -15,18 +15,9 @@ ivec3 unpackPos(ivec2 pos) {
} }
bool shouldRender(ivec3 icorner) { bool shouldRender(ivec3 icorner) {
#ifdef USE_SODIUM_EXTRA_CULLING
#define MIN 0
#define MAX 16
#else
#define MIN 1
#define MAX 17
#endif
vec3 corner = vec3(mix(mix(ivec3(0), icorner-MIN, greaterThan(icorner-MIN, ivec3(0))), icorner+MAX, lessThan(icorner+MAX, ivec3(0))))-negInnerSec.xyz; vec3 corner = vec3(mix(mix(ivec3(0), icorner-MIN, greaterThan(icorner-MIN, ivec3(0))), icorner+MAX, lessThan(icorner+MAX, ivec3(0))))-negInnerSec.xyz;
bool visible = (corner.x*corner.x + corner.z*corner.z) < (negInnerSec.w*negInnerSec.w); bool visible = (corner.x*corner.x + corner.z*corner.z) < (negInnerSec.w*negInnerSec.w);
#ifndef USE_SODIUM_EXTRA_CULLING
visible = visible && abs(corner.y) < negInnerSec.w; visible = visible && abs(corner.y) < negInnerSec.w;
#endif
return visible; return visible;
} }