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

feat: 'stairs' rotation profile

Browse Source
This commit is contained in:
MihailRis 2025-04-30 20:21:59 +03:00
parent 50aae8b98b
commit 9463917164
4 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/content/loading/BlockLoader.cpp
View File

@ -122,6 +122,8 @@ template<> void ContentUnitLoader<Block>::loadUnit(
def.rotations = BlockRotProfile::PIPE; def.rotations = BlockRotProfile::PIPE;
} else if (profile == BlockRotProfile::PANE_NAME) { } else if (profile == BlockRotProfile::PANE_NAME) {
def.rotations = BlockRotProfile::PANE; def.rotations = BlockRotProfile::PANE;
} else if (profile == BlockRotProfile::STAIRS_NAME) {
def.rotations = BlockRotProfile::STAIRS;
} else if (profile != "none") { } else if (profile != "none") {
logger.error() << "unknown rotation profile " << profile; logger.error() << "unknown rotation profile " << profile;
def.rotatable = false; def.rotatable = false;

12
src/logic/PlayerController.cpp
View File

@ -345,6 +345,16 @@ static int determine_rotation(
if (camDir.z > 0.0f) return BLOCK_DIR_SOUTH; if (camDir.z > 0.0f) return BLOCK_DIR_SOUTH;
if (camDir.z < 0.0f) return BLOCK_DIR_NORTH; if (camDir.z < 0.0f) return BLOCK_DIR_NORTH;
} }
} else if (name == "stairs") {
int verticalBit = ((norm.y - camDir.y * 0.5f) < 0.0) ? 4 : 0;
if (abs(camDir.x) > abs(camDir.z)) {
if (camDir.x > 0.0f) return BLOCK_DIR_EAST | verticalBit;
if (camDir.x < 0.0f) return BLOCK_DIR_WEST | verticalBit;
}
if (abs(camDir.x) < abs(camDir.z)) {
if (camDir.z > 0.0f) return BLOCK_DIR_SOUTH | verticalBit;
if (camDir.z < 0.0f) return BLOCK_DIR_NORTH | verticalBit;
}
} }
} }
return 0; return 0;
@ -421,7 +431,7 @@ void PlayerController::processRightClick(
auto camera = player.fpCamera.get(); auto camera = player.fpCamera.get();
blockstate state {}; blockstate state {};
state.rotation = determine_rotation(&def, selection.normal, camera->dir); state.rotation = determine_rotation(&def, selection.normal, camera->front);
if (!input.shift && target.rt.funcsset.oninteract) { if (!input.shift && target.rt.funcsset.oninteract) {
if (scripting::on_block_interact( if (scripting::on_block_interact(

16
src/voxels/Block.cpp
View File

@ -91,6 +91,22 @@ const BlockRotProfile BlockRotProfile::PANE {
4 4
}; };
const BlockRotProfile BlockRotProfile::STAIRS {
"stairs",
{
{{1, 0, 0}, {0, 1, 0}, {0, 0, 1}}, // North
{{0, 0, -1}, {0, 1, 0}, {1, 0, 0}}, // East
{{-1, 0, 0}, {0, 1, 0}, {0, 0, -1}}, // South
{{0, 0, 1}, {0, 1, 0}, {-1, 0, 0}}, // West
{{-1, 0, 0}, {0, -1, 0}, {0, 0, 1}},
{{0, 0, 1}, {0, -1, 0}, {1, 0, 0}},
{{1, 0, 0}, {0, -1, 0}, {0, 0, -1}},
{{0, 0, -1}, {0, -1, 0}, {-1, 0, 0}},
},
8
};
Block::Block(const std::string& name) Block::Block(const std::string& name)
: name(name), : name(name),
caption(util::id_to_caption(name)), caption(util::id_to_caption(name)),

4
src/voxels/Block.hpp
View File

@ -77,8 +77,12 @@ struct BlockRotProfile {
/// @brief Doors, signs and other panes /// @brief Doors, signs and other panes
static const BlockRotProfile PANE; static const BlockRotProfile PANE;
/// @brief Stairs, stairs and stairs
static const BlockRotProfile STAIRS;
static inline std::string PIPE_NAME = "pipe"; static inline std::string PIPE_NAME = "pipe";
static inline std::string PANE_NAME = "pane"; static inline std::string PANE_NAME = "pane";
static inline std::string STAIRS_NAME = "stairs";
}; };
enum class BlockModelType { enum class BlockModelType {