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

disable mouse camera control if non-standard camera used

Browse Source
This commit is contained in:
MihailRis 2025-11-04 17:55:01 +03:00
parent 751489b003
commit 9e817c39ce
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontend/LevelFrontend.cpp
View File

@ -49,8 +49,7 @@ LevelFrontend::LevelFrontend(
auto sound = rassets.get<audio::Sound>(material->stepsSound); auto sound = rassets.get<audio::Sound>(material->stepsSound);
glm::vec3 pos {}; glm::vec3 pos {};
auto soundsCamera = currentPlayer->currentCamera.get(); auto soundsCamera = currentPlayer->currentCamera.get();
if (soundsCamera == currentPlayer->spCamera.get() || if (currentPlayer->isCurrentCameraBuiltin()) {
soundsCamera == currentPlayer->tpCamera.get()) {
soundsCamera = currentPlayer->fpCamera.get(); soundsCamera = currentPlayer->fpCamera.get();
} }
bool relative = player == currentPlayer && bool relative = player == currentPlayer &&

5
src/logic/PlayerController.cpp
View File

@ -207,8 +207,7 @@ void CameraControl::update(
tpCamera->front = camera->front; tpCamera->front = camera->front;
tpCamera->right = camera->right; tpCamera->right = camera->right;
} }
if (player.currentCamera == spCamera || player.currentCamera == tpCamera || if (player.isCurrentCameraBuiltin()) {
player.currentCamera == camera) {
player.currentCamera->setFov(glm::radians(settings.fov.get())); player.currentCamera->setFov(glm::radians(settings.fov.get()));
} }
} }
@ -280,7 +279,7 @@ void PlayerController::postUpdate(
updateFootsteps(delta); updateFootsteps(delta);
} }
if (!pause && input) { if (!pause && input && player.isCurrentCameraBuiltin()) {
camControl.updateMouse(this->input, windowHeight); camControl.updateMouse(this->input, windowHeight);
} }
camControl.refreshRotation(); camControl.refreshRotation();

6
src/objects/Player.cpp
View File

@ -84,6 +84,12 @@ Hitbox* Player::getHitbox() {
return nullptr; return nullptr;
} }
bool Player::isCurrentCameraBuiltin() const {
return currentCamera.get() == fpCamera.get() ||
currentCamera.get() == spCamera.get() ||
currentCamera.get() == tpCamera.get();
}
void Player::updateSelectedEntity() { void Player::updateSelectedEntity() {
selectedEid = selection.entity; selectedEid = selection.entity;
} }

6
src/objects/Player.hpp
View File

@ -131,6 +131,8 @@ public:
return position; return position;
} }
bool isCurrentCameraBuiltin() const;
Hitbox* getHitbox(); Hitbox* getHitbox();
void setSpawnPoint(glm::vec3 point); void setSpawnPoint(glm::vec3 point);
@ -147,4 +149,8 @@ public:
inline u64id_t getId() const { inline u64id_t getId() const {
return id; return id;
} }
Level& getLevel() const {
return level;
}
}; };