voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-13 06:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix NONE rotation profile

Browse source
This commit is contained in:
MihailRis 2024-07-14 01:57:18 +03:00
parent ea765ffc0c
commit 638a0d9850
2 changed files with 40 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/voxels/Block.hpp
View file

@ -58,6 +58,9 @@ struct BlockRotProfile {
std::string name;
CoordSystem variants[MAX_COUNT];
/// @brief No rotation
static const BlockRotProfile NONE;
/// @brief Wood logs, pillars, pipes
static const BlockRotProfile PIPE;
@ -160,7 +163,7 @@ public:
std::vector<AABB> hitboxes;
/// @brief Set of available block rotations (coord-systems)
BlockRotProfile rotations;
BlockRotProfile rotations = BlockRotProfile::NONE;
/// @brief Item will be picked on MMB click on the block
std::string pickingItem = name+BLOCK_ITEM_SUFFIX;
@ -207,12 +210,7 @@ public:
};
inline glm::ivec3 get_ground_direction(const Block* def, int rotation) {
const auto& profileName = def->rotations.name;
if (profileName == BlockRotProfile::PIPE_NAME) {
return -def->rotations.variants[rotation].axisY;
} else {
return glm::ivec3(0, -1, 0);
}
return -def->rotations.variants[rotation].axisY;
}
#endif // VOXELS_BLOCK_HPP_