diff --git a/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java b/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java index 68be89ed..73bfbfec 100644 --- a/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java +++ b/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java @@ -100,40 +100,6 @@ public class VoxyRenderSystem { } - //private static final ModelTextureBakery mtb = new ModelTextureBakery(16, 16); - //private static final RawDownloadStream downstream = new RawDownloadStream(1<<20); - public void renderSetup(Frustum frustum, Camera camera) { - TimingStatistics.resetSamplers(); - - /* - if (false) { - int allocation = downstream.download(2 * 4 * 6 * 16 * 16, ptr -> { - ColourDepthTextureData[] textureData = new ColourDepthTextureData[6]; - final int FACE_SIZE = 16 * 16; - for (int face = 0; face < 6; face++) { - long faceDataPtr = ptr + (FACE_SIZE * 4) * face * 2; - int[] colour = new int[FACE_SIZE]; - int[] depth = new int[FACE_SIZE]; - - //Copy out colour - for (int i = 0; i < FACE_SIZE; i++) { - //De-interpolate results - colour[i] = MemoryUtil.memGetInt(faceDataPtr + (i * 4 * 2)); - depth[i] = MemoryUtil.memGetInt(faceDataPtr + (i * 4 * 2) + 4); - } - - textureData[face] = new ColourDepthTextureData(colour, depth, 16, 16); - } - if (textureData[0].colour()[0] == 0) { - int a = 0; - } - }); - mtb.renderFacesToStream(Blocks.AIR.getDefaultState(), 123456, false, downstream.getBufferId(), allocation); - downstream.submit(); - downstream.tick(); - }*/ - } - private void autoBalanceSubDivSize() { //only increase quality while there are very few mesh queues, this stops, // e.g. while flying and is rendering alot of low quality chunks @@ -176,6 +142,9 @@ public class VoxyRenderSystem { if (IrisUtil.irisShadowActive()) { return; } + TimingStatistics.resetSamplers(); + + //Do some very cheeky stuff for MiB if (false) { int sector = (((int)Math.floor(cameraX)>>4)+512)>>10; diff --git a/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java index fea51c57..f9b31047 100644 --- a/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java +++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java @@ -26,13 +26,6 @@ public abstract class MixinWorldRenderer implements IGetVoxyRenderSystem { @Shadow private @Nullable ClientWorld world; @Unique private VoxyRenderSystem renderer; - @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;setupTerrain(Lnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/Frustum;ZZ)V", shift = At.Shift.AFTER)) - private void injectSetup(ObjectAllocator allocator, RenderTickCounter tickCounter, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, Matrix4f positionMatrix, Matrix4f projectionMatrix, CallbackInfo ci) { - if (this.renderer != null) { - this.renderer.renderSetup(this.frustum, camera); - } - } - @Override public VoxyRenderSystem getVoxyRenderSystem() { return this.renderer;