From 7b4fe4bd5c8bd61ef0afb22e34fa8b84f9c1151f Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Wed, 2 Jul 2025 11:49:13 +1000 Subject: [PATCH] thing --- .../java/me/cortex/voxy/client/core/model/ModelFactory.java | 2 +- .../java/me/cortex/voxy/client/core/model/ModelStore.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java b/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java index c0731334..e4e4e963 100644 --- a/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java +++ b/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java @@ -680,7 +680,7 @@ public class ModelFactory { private static final int LAYERS = Integer.numberOfTrailingZeros(MODEL_TEXTURE_SIZE); //TODO: redo to batch blit, instead of 6 seperate blits, and also fix mipping private void putTextures(int id, ColourDepthTextureData[] textures) { - if (MODEL_TEXTURE_SIZE != 16) {throw new IllegalStateException("THIS METHOD MUST BE REDONE IF THIS CONST CHANGES");} + //if (MODEL_TEXTURE_SIZE != 16) {throw new IllegalStateException("THIS METHOD MUST BE REDONE IF THIS CONST CHANGES");} //TODO: need to use a write mask to see what pixels must be used to contribute to mipping // as in, using the depth/stencil info, check if pixel was written to, if so, use that pixel when blending, else dont diff --git a/src/main/java/me/cortex/voxy/client/core/model/ModelStore.java b/src/main/java/me/cortex/voxy/client/core/model/ModelStore.java index 1a80f374..55ba988b 100644 --- a/src/main/java/me/cortex/voxy/client/core/model/ModelStore.java +++ b/src/main/java/me/cortex/voxy/client/core/model/ModelStore.java @@ -24,14 +24,14 @@ public class ModelStore { public ModelStore() { this.modelBuffer = new GlBuffer(MODEL_SIZE * (1<<16)).name("ModelData"); this.modelColourBuffer = new GlBuffer(4 * (1<<16)).name("ModelColour"); - this.textures = new GlTexture().store(GL_RGBA8, 4, ModelFactory.MODEL_TEXTURE_SIZE*3*256,ModelFactory.MODEL_TEXTURE_SIZE*2*256).name("ModelTextures"); + this.textures = new GlTexture().store(GL_RGBA8, Integer.numberOfTrailingZeros(ModelFactory.MODEL_TEXTURE_SIZE), ModelFactory.MODEL_TEXTURE_SIZE*3*256,ModelFactory.MODEL_TEXTURE_SIZE*2*256).name("ModelTextures"); glSamplerParameteri(this.blockSampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR); glSamplerParameteri(this.blockSampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glSamplerParameteri(this.blockSampler, GL_TEXTURE_MIN_LOD, 0); - glSamplerParameteri(this.blockSampler, GL_TEXTURE_MAX_LOD, 4); + glSamplerParameteri(this.blockSampler, GL_TEXTURE_MAX_LOD, Integer.numberOfTrailingZeros(ModelFactory.MODEL_TEXTURE_SIZE)); }