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

move player animation to base:player_animator component

Browse Source
This commit is contained in:
MihailRis
2025-01-16 06:58:53 +03:00
parent 9cd3f3e4c8
commit 43dc88c6b5
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/PlayerController.cpp
+7 -7
View File
@@ -170,8 +170,8 @@ void CameraControl::update(
switchCamera();
}
auto& spCamera = player.spCamera;
auto& tpCamera = player.tpCamera;
const auto& spCamera = player.spCamera;
const auto& tpCamera = player.tpCamera;
refresh();
@@ -316,15 +316,15 @@ static int determine_rotation(
if (name == "pipe") {
if (norm.x < 0.0f)
return BLOCK_DIR_WEST;
else if (norm.x > 0.0f)
if (norm.x > 0.0f)
return BLOCK_DIR_EAST;
else if (norm.y > 0.0f)
if (norm.y > 0.0f)
return BLOCK_DIR_UP;
else if (norm.y < 0.0f)
if (norm.y < 0.0f)
return BLOCK_DIR_DOWN;
else if (norm.z > 0.0f)
if (norm.z > 0.0f)
return BLOCK_DIR_NORTH;
else if (norm.z < 0.0f)
if (norm.z < 0.0f)
return BLOCK_DIR_SOUTH;
} else if (name == "pane") {
if (abs(camDir.x) > abs(camDir.z)) {
src/objects/Player.cpp
+1 -15
View File
@@ -170,23 +170,9 @@ void Player::postUpdate() {
}
}
// TODO: ERASE & FORGET
auto& skeleton = entity->getSkeleton();
skeleton.visible = currentCamera != fpCamera;
auto body = skeleton.config->find("body");
auto head = skeleton.config->find("head");
if (body) {
skeleton.pose.matrices[body->getIndex()] = glm::rotate(
glm::mat4(1.0f), glm::radians(rotation.x), glm::vec3(0, 1, 0)
);
}
if (head) {
skeleton.pose.matrices[head->getIndex()] = glm::rotate(
glm::mat4(1.0f), glm::radians(rotation.y), glm::vec3(1, 0, 0)
);
}
}
void Player::teleport(glm::vec3 position) {