Skip to content

Commit

Permalink
Clean up; now JustMap pixel coloring is basically done
Browse files Browse the repository at this point in the history
  • Loading branch information
@magicus
magicus committed Nov 23, 2021
1 parent 989c6d8 commit 5df150e
Showing 1 changed file with 57 additions and 54 deletions.
111 changes: 57 additions & 54 deletions src/main/java/ru/bulldog/justmap/map/data/fast/MapChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,15 @@ private void updateScoutedData(World world, WorldChunk worldChunk, BlockPos.Muta
while (solidY < 0) {
pos.setY(y);
BlockState blockState = worldChunk.getBlockState(pos);
if (waterY < 0 &&
(!blockState.getFluidState().isEmpty() && blockState.getFluidState().isIn(FluidTags.WATER))) {
if (waterY < 0 && isWaterBlockState(blockState)) {
waterY = y;
}
if (transparentY < 0 &&
blockState.getMapColor(world, pos) == MapColor.CLEAR) {
if (transparentY < 0 && isTransparentBlockState(world, pos, blockState)) {
transparentY = y;
transparentBlock = blockState;
}

if (blockState.getMapColor(world, pos) != MapColor.CLEAR
&& blockState.getFluidState().isEmpty() && !blockState.getFluidState().isIn(FluidTags.WATER)) {
if (!isTransparentBlockState(world, pos, blockState) && !isWaterBlockState(blockState)) {
solidY = y;
solidBlock = blockState;
}
Expand All @@ -124,6 +121,22 @@ private void updateScoutedData(World world, WorldChunk worldChunk, BlockPos.Muta
scoutedTransparentBlocks[xOffset][zOffset] = Block.getRawIdFromState(transparentBlock);
}

private boolean isWaterBlockState(BlockState blockState) {
return !blockState.getFluidState().isEmpty() && blockState.getFluidState().isIn(FluidTags.WATER);
}

private boolean isTransparentBlockState(World world, BlockPos.Mutable pos, BlockState blockState) {
return blockState.getMapColor(world, pos) == MapColor.CLEAR || isPlant(blockState);
}

private boolean isPlant(BlockState state) {
Material material = state.getMaterial();
return material == Material.PLANT
|| material == Material.REPLACEABLE_PLANT
|| material == Material.UNDERWATER_PLANT
|| material == Material.REPLACEABLE_UNDERWATER_PLANT;
}

private void updateDerivedData(World world, WorldChunk worldChunk, int xOffset, int zOffset) {
int solidY = scoutedSolidY[xOffset][zOffset];

Expand All @@ -144,7 +157,10 @@ private void updateDerivedData(World world, WorldChunk worldChunk, int xOffset,
derivedDeltaY[xOffset][zOffset] = (byte) my_delta;
}

private int getJustMapPixelColor(int xOffset, int zOffset, BlockPos.Mutable blockPos) {
private int calculateJustMapPixelColor(int xOffset, int zOffset, BlockPos.Mutable blockPos) {
World world = FastMapManager.MANAGER.getFastWorldMapper().getWorld();
int color;

int solidY = scoutedSolidY[xOffset][zOffset];
int transparentY = scoutedTransparentY[xOffset][zOffset];
int waterY = scoutedWaterY[xOffset][zOffset];
Expand All @@ -153,19 +169,41 @@ private int getJustMapPixelColor(int xOffset, int zOffset, BlockPos.Mutable bloc
BlockState solidBlock = Block.getStateFromRawId(scoutedSolidBlocks[xOffset][zOffset]);
BlockState transparentBlock = Block.getStateFromRawId(scoutedTransparentBlocks[xOffset][zOffset]);

// Determine highest Y to look at
blockPos.setY(solidY);
// Get basic pixel color
int color = getTintedBlockColor(FastMapManager.MANAGER.getFastWorldMapper().getWorld(), blockPos, transparentY, waterY, solidBlock, transparentBlock);
if (color != -1) {
// Topology processing
float topoLevel = getTopoLevel(solidY);
color = ColorUtil.processColor(color, deltaY, topoLevel);
if (ClientSettings.showTopography) {
return MathUtil.isEven(solidY) ? color : ColorUtil.colorBrigtness(color, -0.6F);
int topY = solidY;
if (!ClientSettings.hidePlants && transparentY > topY && isPlant(transparentBlock)) {
// We'll use the plant block pointed to by "transparent" instead
topY = transparentY;
blockPos.setY(topY);
solidBlock = transparentBlock;
}

// Get base color
if (topY <= waterY && !ClientSettings.hideWater) {
// Top Y is under water
if (ClientSettings.waterTint) {
int innerColor = ColorUtil.getBlockColorInner(world, solidBlock, blockPos);
color = ColorUtil.applyTint(innerColor, BiomeColors.getWaterColor(world, blockPos));
} else {
color = ColorUtil.getBlockColorInner(world, Blocks.WATER.getDefaultState(), blockPos);
}
return color;
} else {
if (topY >= 0) {
color = ColorUtil.getBlockColorInner(world, solidBlock, blockPos);
} else {
// Hole to the void
return Colors.BLACK;
}
}

// Topology processing
float topoLevel = getTopoLevel(solidY);
color = ColorUtil.processColor(color, deltaY, topoLevel);
if (ClientSettings.showTopography) {
return MathUtil.isEven(solidY) ? color : ColorUtil.colorBrigtness(color, -0.6F);
}
return Colors.BLACK;
return color;
}

private float getTopoLevel(int solidY) {
Expand All @@ -187,42 +225,7 @@ private float getTopoLevel(int solidY) {
return topoLevel;
}

private static int getTintedBlockColor(World world, BlockPos.Mutable pos, int transparentY, int waterY, BlockState blockState, BlockState transparentBlockState) {
int topY = pos.getY();
if (!ClientSettings.hidePlants && transparentY > topY && isPlant(transparentBlockState)) {
// We'll use the plant block pointed to by "transparent" instead
topY = transparentY;
pos.setY(topY);
blockState = transparentBlockState;
}

if (topY <= waterY && !ClientSettings.hideWater) {
if (ClientSettings.waterTint) {
int color = ColorUtil.getBlockColorInner(world, blockState, pos);
return ColorUtil.applyTint(color, BiomeColors.getWaterColor(world, pos));
} else {
return ColorUtil.getBlockColorInner(world, Blocks.WATER.getDefaultState(), pos);
}
} else {
if (topY >= 0) {
return ColorUtil.getBlockColorInner(world, blockState, pos);
} else {
// Hole to the void
return -1;
}
}
}

public static boolean isPlant(BlockState state) {
Material material = state.getMaterial();
return material == Material.PLANT
|| material == Material.REPLACEABLE_PLANT
|| material == Material.UNDERWATER_PLANT
|| material == Material.REPLACEABLE_UNDERWATER_PLANT;
}


private int getVanillaPixelColor(int xOffset, int zOffset) {
private int calculateVanillaPixelColor(int xOffset, int zOffset, BlockPos.Mutable ignored) {
int solidY = scoutedSolidY[xOffset][zOffset];
int transparentY = scoutedTransparentY[xOffset][zOffset];
int waterY = scoutedWaterY[xOffset][zOffset];
Expand Down Expand Up @@ -276,7 +279,7 @@ private int getVanillaPixelColor(int xOffset, int zOffset) {
}

private void updatePixelColor(int x, int z, BlockPos.Mutable blockPos) {
int color = getJustMapPixelColor(x, z, blockPos);
int color = calculateJustMapPixelColor(x, z, blockPos);

int xOffset = x * 4;
pixelColors[z][xOffset + 0] = (byte) 0;
Expand Down

0 comments on commit 5df150e

Please sign in to comment.