wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename FullDataPoint getDepth() -> getHeight() and getY() -> getBottomY()

Browse Source
This commit is contained in:
James Seibel
2022-11-13 22:11:21 -06:00
parent cd1c12be12
commit c67079c928
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java
Vendored
+6 -6
View File
@@ -189,8 +189,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
if (dataPoint != 0)
{
int requestedY = nullableBlockYPos;
int bottomY = FullDataPoint.getY(dataPoint) + levelMinimumHeight; // TODO rename getY to getBottomY
int height = FullDataPoint.getDepth(dataPoint); // TODO rename to getHeight
int bottomY = FullDataPoint.getBottomY(dataPoint) + levelMinimumHeight;
int height = FullDataPoint.getHeight(dataPoint);
int topY = bottomY + height;
// does this datapoint contain the requested Y position?
@@ -220,14 +220,14 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
}
}
private static DhApiTerrainDataPoint generateApiDatapoint(FullDataPointIdMap mapping, byte detailLevel, long dataPoint)
private static DhApiTerrainDataPoint generateApiDatapoint(IDhApiLevelWrapper levelWrapper, FullDataPointIdMap mapping, byte detailLevel, long dataPoint)
{
IBlockStateWrapper blockState = mapping.getBlockStateWrapper(FullDataPoint.getId(dataPoint));
IBiomeWrapper biomeWrapper = mapping.getBiomeWrapper(FullDataPoint.getId(dataPoint));
int topY = FullDataPoint.getY(dataPoint);
int depth = FullDataPoint.getDepth(dataPoint);
int bottomY = topY - depth;
int bottomY = FullDataPoint.getBottomY(dataPoint) + levelWrapper.getMinHeight();
int height = FullDataPoint.getHeight(dataPoint);
int topY = bottomY + height;
return new DhApiTerrainDataPoint(detailLevel,
FullDataPoint.getLight(dataPoint), topY, bottomY,
core/src/main/java/com/seibel/lod/core/datatype/full/FullDataPoint.java
+9 -5
View File
@@ -39,6 +39,7 @@ public class FullDataPoint
public static final int LIGHT_WIDTH = 8;
public static final int ID_OFFSET = 0;
public static final int DP_OFFSET = ID_OFFSET + ID_WIDTH;
/** indicates the Y position where the LOD starts relative to the level's minimum height */
public static final int Y_OFFSET = DP_OFFSET + DP_WIDTH;
public static final int LIGHT_OFFSET = Y_OFFSET + Y_WIDTH;
@@ -62,19 +63,22 @@ public class FullDataPoint
data |= (long) (depth & DP_MASK) << DP_OFFSET;
data |= (long) (y & Y_MASK) << Y_OFFSET;
data |= (long) lightPair << LIGHT_OFFSET;
LodUtil.assertTrue(getId(data) == id && getDepth(data) == depth && getY(data) == y && getLight(data) == Byte.toUnsignedInt(lightPair),
LodUtil.assertTrue(getId(data) == id && getHeight(data) == depth && getBottomY(data) == y && getLight(data) == Byte.toUnsignedInt(lightPair),
"Trying to create datapoint with id[{}], depth[{}], y[{}], lightPair[{}] but got id[{}], depth[{}], y[{}], lightPair[{}]!",
id, depth, y, Byte.toUnsignedInt(lightPair), getId(data), getDepth(data), getY(data), getLight(data));
id, depth, y, Byte.toUnsignedInt(lightPair), getId(data), getHeight(data), getBottomY(data), getLight(data));
return data;
}
/** Returns the BlockState/Biome pair ID used to identify this LOD's color */
public static int getId(long data) { return (int) (data & ID_MASK); }
public static int getDepth(long data) { return (int) ((data >> DP_OFFSET) & DP_MASK); }
public static int getY(long data) { return (int) ((data >> Y_OFFSET) & Y_MASK); }
/** Returns how many blocks tall this LOD is. */
public static int getHeight(long data) { return (int) ((data >> DP_OFFSET) & DP_MASK); }
/** Returns the block position of the bottom vertices for this LOD relative to the level's minimum height. */
public static int getBottomY(long data) { return (int) ((data >> Y_OFFSET) & Y_MASK); }
public static int getLight(long data) { return (int) ((data >> LIGHT_OFFSET) & LIGHT_MASK); }
public static String toString(long data) { return "[ID:" + getId(data) + ",Y:" + getY(data) + ",Depth:" + getY(data) + ",Light:" + getLight(data) + "]"; }
public static String toString(long data) { return "[ID:" + getId(data) + ",Y:" + getBottomY(data) + ",Height:" + getBottomY(data) + ",Light:" + getLight(data) + "]"; }
/** Remaps the biome/blockState ID of the given datapoint */
@Contract(pure = true)
core/src/main/java/com/seibel/lod/core/datatype/transform/FullToColumnTransformer.java
+4 -4
View File
@@ -168,16 +168,16 @@ public class FullToColumnTransformer {
int offset = 0;
for (int i = 0; i < data.getSingleLength(); i++) {
long fullData = data.getSingle(i);
int y = FullDataPoint.getY(fullData);
int blockLength = FullDataPoint.getDepth(fullData);
int bottomY = FullDataPoint.getBottomY(fullData);
int blockHeight = FullDataPoint.getHeight(fullData);
int id = FullDataPoint.getId(fullData);
int light = FullDataPoint.getLight(fullData);
IBiomeWrapper biome = mapping.getBiomeWrapper(id);
IBlockStateWrapper block = mapping.getBlockStateWrapper(id);
if (block.equals(AIR)) continue;
isVoid = false;
int color = level.computeBaseColor(new DhBlockPos(blockX, y + level.getMinY(), blockZ), biome, block);
long columnData = ColumnFormat.createDataPoint(y + blockLength, y, color, light, genMode);
int color = level.computeBaseColor(new DhBlockPos(blockX, bottomY + level.getMinY(), blockZ), biome, block);
long columnData = ColumnFormat.createDataPoint(bottomY + blockHeight, bottomY, color, light, genMode);
column.set(offset, columnData);
offset++;
}