PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

add new block.get_AXIS functions overloads & add rotation support to base:falling_block

Browse Source
This commit is contained in:
MihailRis
2024-12-29 21:48:36 +03:00
parent 9a190acb8b
commit ab5a62c3aa
9 changed files with 72 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/voxels/Block.cpp
+4 -4
View File
@@ -74,7 +74,7 @@ std::optional<CullingMode> CullingMode_from(std::string_view str) {
}
CoordSystem::CoordSystem(glm::ivec3 axisX, glm::ivec3 axisY, glm::ivec3 axisZ)
: axisX(axisX), axisY(axisY), axisZ(axisZ) {
: axes({axisX, axisY, axisZ}) {
fix = glm::ivec3(0);
if (isVectorHasNegatives(axisX)) fix -= axisX;
if (isVectorHasNegatives(axisY)) fix -= axisY;
@@ -82,9 +82,9 @@ CoordSystem::CoordSystem(glm::ivec3 axisX, glm::ivec3 axisY, glm::ivec3 axisZ)
}
void CoordSystem::transform(AABB& aabb) const {
glm::vec3 X(axisX);
glm::vec3 Y(axisY);
glm::vec3 Z(axisZ);
glm::vec3 X(axes[0]);
glm::vec3 Y(axes[1]);
glm::vec3 Z(axes[2]);
aabb.a = X * aabb.a.x + Y * aabb.a.y + Z * aabb.a.z;
aabb.b = X * aabb.b.x + Y * aabb.b.y + Z * aabb.b.z;
aabb.a += fix;
src/voxels/Block.hpp
+2 -5
View File
@@ -47,10 +47,7 @@ struct BlockFuncsSet {
};
struct CoordSystem {
glm::ivec3 axisX;
glm::ivec3 axisY;
glm::ivec3 axisZ;
std::array<glm::ivec3, 3> axes;
/// @brief Grid 3d position fix offset (for negative vectors)
glm::ivec3 fix;
@@ -261,5 +258,5 @@ public:
};
inline glm::ivec3 get_ground_direction(const Block& def, int rotation) {
return -def.rotations.variants[rotation].axisY;
return -def.rotations.variants[rotation].axes[1];
}
src/voxels/blocks_agent.hpp
+18 -18
View File
@@ -162,9 +162,9 @@ inline void erase_segments(
continue;
}
glm::ivec3 pos(x, y, z);
pos += rotation.axisX * sx;
pos += rotation.axisY * sy;
pos += rotation.axisZ * sz;
pos += rotation.axes[0] * sx;
pos += rotation.axes[1] * sy;
pos += rotation.axes[2] * sz;
set(chunks, pos.x, pos.y, pos.z, 0, {});
}
}
@@ -205,9 +205,9 @@ inline void repair_segments(
segState.segment = segment_to_int(sx, sy, sz);
glm::ivec3 pos(x, y, z);
pos += rotation.axisX * sx;
pos += rotation.axisY * sy;
pos += rotation.axisZ * sz;
pos += rotation.axes[0] * sx;
pos += rotation.axes[1] * sy;
pos += rotation.axes[2] * sz;
set(chunks, pos.x, pos.y, pos.z, id, segState);
}
}
@@ -233,9 +233,9 @@ inline glm::ivec3 seek_origin(
if (!segment) {
return pos;
}
if (segment & 1) pos -= rotation.axisX;
if (segment & 2) pos -= rotation.axisY;
if (segment & 4) pos -= rotation.axisZ;
if (segment & 1) pos -= rotation.axes[0];
if (segment & 2) pos -= rotation.axes[1];
if (segment & 4) pos -= rotation.axes[2];
if (auto* voxel = get(chunks, pos.x, pos.y, pos.z)) {
segment = voxel->state.segment;
@@ -268,9 +268,9 @@ inline bool check_replaceability(
for (int sz = 0; sz < size.z; sz++) {
for (int sx = 0; sx < size.x; sx++) {
auto pos = origin;
pos += rotation.axisX * sx;
pos += rotation.axisY * sy;
pos += rotation.axisZ * sz;
pos += rotation.axes[0] * sx;
pos += rotation.axes[1] * sy;
pos += rotation.axes[2] * sz;
if (auto vox = get(chunks, pos.x, pos.y, pos.z)) {
auto& target = blocks.require(vox->id);
if (!target.replaceable && vox->id != ignore) {
@@ -316,9 +316,9 @@ inline void set_rotation_extended(
for (int sz = 0; sz < size.z; sz++) {
for (int sx = 0; sx < size.x; sx++) {
auto pos = origin;
pos += rotation.axisX * sx;
pos += rotation.axisY * sy;
pos += rotation.axisZ * sz;
pos += rotation.axes[0] * sx;
pos += rotation.axes[1] * sy;
pos += rotation.axes[2] * sz;
blockstate segState = newstate;
segState.segment = segment_to_int(sx, sy, sz);
@@ -344,9 +344,9 @@ inline void set_rotation_extended(
for (int sz = 0; sz < size.z; sz++) {
for (int sx = 0; sx < size.x; sx++) {
auto pos = origin;
pos += prevRotation.axisX * sx;
pos += prevRotation.axisY * sy;
pos += prevRotation.axisZ * sz;
pos += prevRotation.axes[0] * sx;
pos += prevRotation.axes[1] * sy;
pos += prevRotation.axes[2] * sz;
if (std::find(
segmentBlocks.begin(), segmentBlocks.end(), pos
) == segmentBlocks.end()) {