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

Remove old funtionality of quad encoder

Browse Source
This commit is contained in:
mcrcortex
2024-01-30 14:38:27 +10:00
parent c2b68da9eb
commit 80bd0d7c67
2 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/me/cortex/zenith/client/core/rendering/building/QuadEncoder.java
View File

@@ -11,44 +11,6 @@ import net.minecraft.util.math.BlockPos;
public class QuadEncoder { public class QuadEncoder {
private final BlockColors colourProvider;
private final Mapper mapper;
private final ClientWorld worldIn;
public QuadEncoder(Mapper mapper, BlockColors colourProvider, ClientWorld worldIn) {
this.colourProvider = colourProvider;
this.mapper = mapper;
this.worldIn = worldIn;
}
//Normalize block states that result in the same output state, (this improves meshing)
// such as the 8 different types of leaves (due to distance from wood) should get normalized to 1 type
// if the textures are the same
public long normalizeBlockState(long id) {
//TODO: This
return id;
}
private int getColour(long id, int x, int y, int z) {
//TODO: need to inject the biome somehow
return this.colourProvider.getColor(this.mapper.getBlockStateFromId(id), this.worldIn, new BlockPos(x, y, z), 0);
}
//The way it works is that, when encoding, use a local colour mapping, then it remaps later to a global colour store
public long encode(long id, int face, int otherAxis, int encodedMeshedData) {
int encodePosition = encodePosition(face, otherAxis, encodedMeshedData);//26 bits
int lighting = (int) ((id>>56)&0xFF);//8 bits
int biome = (int) ((id>>47)&((1<<9)-1));
int blockstate = (int) ((id>>20)&((1<<20)-1));
//int blockColour = this.getColour(id, -1, -1, -1);
// if blockColour is -1 it means it doesnt have colour
return ((id>>>27)<<26)|Integer.toUnsignedLong(encodePosition);
}
//Note: the encodedMeshedData is from the Mesher2D //Note: the encodedMeshedData is from the Mesher2D
public static int encodePosition(int face, int otherAxis, int encodedMeshedData) { public static int encodePosition(int face, int otherAxis, int encodedMeshedData) {

2
src/main/java/me/cortex/zenith/client/core/rendering/building/RenderDataFactory.java
View File

@@ -15,7 +15,6 @@ import org.lwjgl.system.MemoryUtil;
public class RenderDataFactory { public class RenderDataFactory {
private final WorldEngine world; private final WorldEngine world;
private final ModelManager modelMan; private final ModelManager modelMan;
private final QuadEncoder encoder;
private final Mesher2D negativeMesher = new Mesher2D(5, 15); private final Mesher2D negativeMesher = new Mesher2D(5, 15);
private final Mesher2D positiveMesher = new Mesher2D(5, 15); private final Mesher2D positiveMesher = new Mesher2D(5, 15);
@@ -37,7 +36,6 @@ public class RenderDataFactory {
public RenderDataFactory(WorldEngine world, ModelManager modelManager) { public RenderDataFactory(WorldEngine world, ModelManager modelManager) {
this.world = world; this.world = world;
this.modelMan = modelManager; this.modelMan = modelManager;
this.encoder = new QuadEncoder(world.getMapper(), MinecraftClient.getInstance().getBlockColors(), MinecraftClient.getInstance().world);
} }