Merge remote-tracking branch 'origin/pvs-fix' into pvs-fix
This commit is contained in:
commit
815ba45747
@ -257,13 +257,13 @@ void PlayerController::postUpdate(float delta, bool input, bool pause) {
|
|||||||
if (!pause && input) {
|
if (!pause && input) {
|
||||||
camControl.updateMouse(this->input);
|
camControl.updateMouse(this->input);
|
||||||
}
|
}
|
||||||
|
player->postUpdate();
|
||||||
|
camControl.update(this->input, delta, level->chunks.get());
|
||||||
if (input) {
|
if (input) {
|
||||||
updateInteraction();
|
updateInteraction();
|
||||||
} else {
|
} else {
|
||||||
player->selection = {};
|
player->selection = {};
|
||||||
}
|
}
|
||||||
player->postUpdate();
|
|
||||||
camControl.update(this->input, delta, level->chunks.get());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlayerController::updateKeyboard() {
|
void PlayerController::updateKeyboard() {
|
||||||
|
|||||||
@ -143,7 +143,6 @@ void Player::updateSelectedEntity() {
|
|||||||
selectedEid = selection.entity;
|
selectedEid = selection.entity;
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "../window/Window.hpp"
|
|
||||||
void Player::postUpdate() {
|
void Player::postUpdate() {
|
||||||
auto entity = level->entities->get(eid);
|
auto entity = level->entities->get(eid);
|
||||||
if (!entity.has_value()) {
|
if (!entity.has_value()) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user