Windcorp/JavaProgressia
Windcorp/JavaProgressia
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved .setBlockRel(...) implementation to GenericWritableChunk

Browse Source
This commit is contained in:
OLEGSHA 2021-04-09 20:15:07 +03:00
parent e0a03cad1d
commit a95bdf1efe
Signed by: OLEGSHA
GPG Key ID: E57A4B08D64AFF7A
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/ru/windcorp/progressia/common/world/ChunkData.java
View File

@ -28,7 +28,6 @@ import java.util.Objects;
import glm.vec._3.i.Vec3i; import glm.vec._3.i.Vec3i;
import ru.windcorp.progressia.common.util.Vectors;
import ru.windcorp.progressia.common.world.block.BlockData; import ru.windcorp.progressia.common.world.block.BlockData;
import ru.windcorp.progressia.common.world.generic.GenericChunk; import ru.windcorp.progressia.common.world.generic.GenericChunk;
import ru.windcorp.progressia.common.world.generic.GenericWritableChunk; import ru.windcorp.progressia.common.world.generic.GenericWritableChunk;
@ -94,14 +93,6 @@ public class ChunkData
}); });
} }
} }
@Override
public void setBlockRel(Vec3i relativeBlockInChunk, BlockData block, boolean notify) {
Vec3i absoluteBlockInChunk = Vectors.grab3i();
resolve(relativeBlockInChunk, absoluteBlockInChunk);
setBlock(absoluteBlockInChunk, block, notify);
Vectors.release(absoluteBlockInChunk);
}
@Override @Override
public TileDataStack getTilesOrNull(Vec3i blockInChunk, BlockFace face) { public TileDataStack getTilesOrNull(Vec3i blockInChunk, BlockFace face) {

4
src/main/java/ru/windcorp/progressia/common/world/generic/GenericChunk.java
View File

@ -105,14 +105,14 @@ public interface GenericChunk<
boolean hasTiles(Vec3i blockInChunk, BlockFace face); boolean hasTiles(Vec3i blockInChunk, BlockFace face);
default Vec3i resolve(Vec3i relativeBlockInChunk, Vec3i output) { default Vec3i resolve(Vec3i relativeCoords, Vec3i output) {
if (output == null) { if (output == null) {
output = new Vec3i(); output = new Vec3i();
} }
final int offset = BLOCKS_PER_CHUNK - 1; final int offset = BLOCKS_PER_CHUNK - 1;
output.set(relativeBlockInChunk.x, relativeBlockInChunk.y, relativeBlockInChunk.z); output.set(relativeCoords.x, relativeCoords.y, relativeCoords.z);
output.mul(2).sub(offset); output.mul(2).sub(offset);
AxisRotations.resolve(output, getUp(), output); AxisRotations.resolve(output, getUp(), output);

8
src/main/java/ru/windcorp/progressia/common/world/generic/GenericWritableChunk.java
View File

@ -18,6 +18,7 @@
package ru.windcorp.progressia.common.world.generic; package ru.windcorp.progressia.common.world.generic;
import glm.vec._3.i.Vec3i; import glm.vec._3.i.Vec3i;
import ru.windcorp.progressia.common.util.Vectors;
// @formatter:off // @formatter:off
public interface GenericWritableChunk< public interface GenericWritableChunk<
@ -32,6 +33,11 @@ public interface GenericWritableChunk<
void setBlock(Vec3i posInChunk, B block, boolean notify); void setBlock(Vec3i posInChunk, B block, boolean notify);
void setBlockRel(Vec3i relativeBlockInChunk, B block, boolean notify); default void setBlockRel(Vec3i relativeBlockInChunk, B block, boolean notify) {
Vec3i absoluteBlockInChunk = Vectors.grab3i();
resolve(relativeBlockInChunk, absoluteBlockInChunk);
setBlock(absoluteBlockInChunk, block, notify);
Vectors.release(absoluteBlockInChunk);
}
} }