Skip to content

Commit e4ea1da

Browse files
committed
more state bs _again_
1 parent 7fcba41 commit e4ea1da

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
import me.cortex.voxy.client.core.rendering.RenderDistanceTracker;
1212
import me.cortex.voxy.client.core.rendering.Viewport;
1313
import me.cortex.voxy.client.core.rendering.ViewportSelector;
14-
import me.cortex.voxy.client.core.rendering.bounding.IBoundStore;
15-
import me.cortex.voxy.client.core.rendering.bounding.OutlineBoundRenderer;
14+
import me.cortex.voxy.client.core.rendering.bounding.BoundRenderer;
1615
import me.cortex.voxy.client.core.rendering.bounding.StreamedBoundStore;
1716
import me.cortex.voxy.client.core.rendering.building.RenderGenerationService;
1817
import me.cortex.voxy.client.core.rendering.hierachical.AsyncNodeManager;
@@ -63,7 +62,7 @@ public class VoxyRenderSystem {
6362

6463

6564
private final RenderDistanceTracker renderDistanceTracker;
66-
private final OutlineBoundRenderer boundOutlineRenderer;
65+
private final BoundRenderer boundOutlineRenderer;
6766
public final StreamedBoundStore visbleSectionStream = new StreamedBoundStore();
6867

6968
private final ViewportSelector<?> viewportSelector;
@@ -153,7 +152,7 @@ public VoxyRenderSystem(WorldEngine world, ServiceManager sm) {
153152
this.setRenderDistance(VoxyConfig.CONFIG.sectionRenderDistance);
154153
}
155154

156-
this.boundOutlineRenderer = new OutlineBoundRenderer(this.pipeline);
155+
this.boundOutlineRenderer = new BoundRenderer(this.pipeline);
157156

158157
Logger.info("Voxy render system created with " + this.geometryData.getMaxCapacity() + " geometry capacity, using pipeline '" + this.pipeline.getClass().getSimpleName() + "' with renderer '" + sectionRenderer.getClass().getSimpleName() + "'");
159158
} catch (RuntimeException e) {
@@ -333,6 +332,8 @@ public void renderOpaque(Viewport<?> viewport, int sourceDepthTexture, int sourc
333332
for (int i = 0; i < oldBufferBindings.length; i++) {
334333
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, i, oldBufferBindings[i]);
335334
}
335+
GlStateManager._disableBlend(0);
336+
GlStateManager._disableDepthTest();
336337

337338
//((SodiumShader) Iris.getPipelineManager().getPipelineNullable().getSodiumPrograms().getProgram(DefaultTerrainRenderPasses.CUTOUT).getInterface()).setupState(DefaultTerrainRenderPasses.CUTOUT, fogParameters);
338339
}

src/main/java/me/cortex/voxy/client/core/rendering/bounding/OutlineBoundRenderer.java renamed to src/main/java/me/cortex/voxy/client/core/rendering/bounding/BoundRenderer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828

2929
//This is a render subsystem, its very simple in what it does
3030
// it renders an AABB around loaded chunks, thats it
31-
public class OutlineBoundRenderer {
31+
public class BoundRenderer {
3232
private final GlBuffer uniformBuffer = new GlBuffer(128);
3333
private final Shader rasterShader;
3434
private final RenderProperties properties;
3535

3636
private final AbstractRenderPipeline pipeline;
37-
public OutlineBoundRenderer(AbstractRenderPipeline pipeline) {
37+
public BoundRenderer(AbstractRenderPipeline pipeline) {
3838
this.properties = pipeline.properties;
3939

4040
String vert = ShaderLoader.parse("voxy:chunkoutline/outline.vsh");

src/main/java/me/cortex/voxy/client/mixin/sodium/MixinDefaultChunkRenderer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import net.caffeinemc.mods.sodium.client.render.viewport.CameraTransform;
2525
import net.caffeinemc.mods.sodium.client.util.FogParameters;
2626
import net.caffeinemc.mods.sodium.mixin.core.CommandEncoderAccessor;
27+
import net.caffeinemc.mods.sodium.mixin.core.GlCommandEncoderAccessor;
2728
import net.caffeinemc.mods.sodium.mixin.core.RenderPassAccessor;
2829
import org.spongepowered.asm.mixin.Mixin;
2930
import org.spongepowered.asm.mixin.Unique;

0 commit comments

Comments
 (0)