This commit is contained in:
MihailRis
2024-12-24 11:31:54 +03:00
parent e153e1fbd7
commit b4abecc764
8 changed files with 29 additions and 12 deletions
+9 -5
View File
@@ -324,7 +324,7 @@ void Hud::update(bool visible) {
const auto& chunks = *player.chunks;
const auto& menu = gui.getMenu();
debugPanel->setVisible(player.debug && visible);
debugPanel->setVisible(debug && visible);
if (!visible && inventoryOpen) {
closeInventory();
@@ -359,7 +359,7 @@ void Hud::update(bool visible) {
if (visible) {
for (auto& element : elements) {
element.update(pause, inventoryOpen, player.debug);
element.update(pause, inventoryOpen, debug);
if (element.isRemoved()) {
onRemove(element);
}
@@ -367,8 +367,8 @@ void Hud::update(bool visible) {
}
cleanup();
debugMinimap->setVisible(player.debug && showGeneratorMinimap);
if (player.debug && showGeneratorMinimap) {
debugMinimap->setVisible(debug && showGeneratorMinimap);
if (debug && showGeneratorMinimap) {
updateWorldGenDebugVisualization();
}
}
@@ -585,6 +585,10 @@ void Hud::remove(const std::shared_ptr<UINode>& node) {
cleanup();
}
void Hud::setDebug(bool flag) {
debug = flag;
}
void Hud::draw(const DrawContext& ctx){
const Viewport& viewport = ctx.getViewport();
const uint width = viewport.getWidth();
@@ -602,7 +606,7 @@ void Hud::draw(const DrawContext& ctx){
uishader.uniformMatrix("u_projview", uicamera->getProjView());
// Crosshair
if (!pause && !inventoryOpen && !player.debug) {
if (!pause && !inventoryOpen && !debug) {
DrawContext chctx = ctx.sub(batch);
chctx.setBlendMode(BlendMode::inversion);
auto texture = assets.get<Texture>("gui/crosshair");
+3
View File
@@ -113,6 +113,7 @@ class Hud : public util::ObjectsKeeper {
bool showContentPanel = true;
/// @brief Provide cheat controllers to the debug panel
bool allowDebugCheats = true;
bool debug = false;
/// @brief UI element will be dynamicly positioned near to inventory or in screen center
std::shared_ptr<gui::UINode> secondUI;
@@ -193,6 +194,8 @@ public:
void onRemove(const HudElement& element);
void remove(const std::shared_ptr<gui::UINode>& node);
void setDebug(bool flag);
Player* getPlayer() const;
std::shared_ptr<Inventory> getBlockInventory();
+3 -1
View File
@@ -157,7 +157,9 @@ void LevelScreen::updateHotkeys() {
hudVisible = !hudVisible;
}
if (Events::jpressed(keycode::F3)) {
player->debug = !player->debug;
debug = !debug;
hud->setDebug(debug);
worldRenderer->setDebug(debug);
}
}
+1
View File
@@ -29,6 +29,7 @@ class LevelScreen : public Screen {
void saveWorldPreview();
bool hudVisible = true;
bool debug = false;
void updateHotkeys();
void initializeContent();
void initializePack(ContentPackRuntime* pack);