From ef81a024c9393c3a86e5a0a8d172400b03921f38 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 14 Feb 2024 04:38:34 +0300
Subject: [PATCH] new crosshair + minor refactor

---
 res/textures/gui/crosshair.png | Bin 0 -> 5272 bytes
 src/assets/AssetsLoader.cpp    |   1 +
 src/frontend/hud.cpp           |  92 ++++++++++++++++++++-------------
 src/frontend/hud.h             |   1 +
 src/window/Window.cpp          |   3 ++
 src/window/Window.h            |   2 +-
 6 files changed, 61 insertions(+), 38 deletions(-)
 create mode 100644 res/textures/gui/crosshair.png

diff --git a/res/textures/gui/crosshair.png b/res/textures/gui/crosshair.png
new file mode 100644
index 0000000000000000000000000000000000000000..7010266b7391ef330630308eed616ef505c3f49f
GIT binary patch
literal 5272
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
YTz+?l>SG3G09QyJJS}MFhjFQY0HU|Nj{pDw

literal 0
HcmV?d00001

diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp
index c03ebf4b..2298904a 100644
--- a/src/assets/AssetsLoader.cpp
+++ b/src/assets/AssetsLoader.cpp
@@ -76,6 +76,7 @@ void AssetsLoader::addDefaults(AssetsLoader& loader, const Content* content) {
         loader.add(ASSET_SHADER, SHADERS_FOLDER"/skybox_gen", "skybox_gen");
         loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/misc/moon.png", "misc/moon");
         loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/misc/sun.png", "misc/sun");
+        loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/gui/crosshair.png", "gui/crosshair");
 
         addLayouts(0, "core", loader.getPaths()->getMainRoot()/fs::path("layouts"), loader);
         for (auto& pack : content->getPacks()) {
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index c0286eed..d54b1d99 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -49,9 +49,6 @@
 #include "../items/Inventory.h"
 #include "../logic/scripting/scripting.h"
 
-using glm::vec2;
-using glm::vec3;
-using glm::vec4;
 using namespace gui;
 
 static std::shared_ptr<Label> create_label(wstringsupplier supplier) {
@@ -63,13 +60,13 @@ static std::shared_ptr<Label> create_label(wstringsupplier supplier) {
 std::shared_ptr<UINode> HudRenderer::createDebugPanel(Engine* engine) {
     auto level = frontend->getLevel();
 
-    auto panel = std::make_shared<Panel>(vec2(250, 200), vec4(5.0f), 2.0f);
+    auto panel = std::make_shared<Panel>(glm::vec2(250, 200), glm::vec4(5.0f), 2.0f);
     panel->listenInterval(0.5f, [this]() {
         fpsString = std::to_wstring(fpsMax)+L" / "+std::to_wstring(fpsMin);
         fpsMin = fps;
         fpsMax = fps;
     });
-    panel->setCoord(vec2(10, 10));
+    panel->setCoord(glm::vec2(10, 10));
     panel->add(create_label([this](){ return L"fps: "+this->fpsString;}));
     panel->add(create_label([](){
         return L"meshes: " + std::to_wstring(Mesh::meshesCount);
@@ -100,15 +97,15 @@ std::shared_ptr<UINode> HudRenderer::createDebugPanel(Engine* engine) {
     }));
 
     for (int ax = 0; ax < 3; ax++){
-        auto sub = std::make_shared<Container>(vec2(), vec2(250, 27));
+        auto sub = std::make_shared<Container>(glm::vec2(), glm::vec2(250, 27));
 
         std::wstring str = L"x: ";
         str[0] += ax;
         auto label = std::make_shared<Label>(str);
-        label->setMargin(vec4(2, 3, 2, 3));
-        label->setSize(vec2(20, 27));
+        label->setMargin(glm::vec4(2, 3, 2, 3));
+        label->setSize(glm::vec2(20, 27));
         sub->add(label);
-        sub->setColor(vec4(0.0f));
+        sub->setColor(glm::vec4(0.0f));
 
         // Coord input
         auto box = std::make_shared<TextBox>(L"");
@@ -118,7 +115,7 @@ std::shared_ptr<UINode> HudRenderer::createDebugPanel(Engine* engine) {
         });
         box->textConsumer([=](std::wstring text) {
             try {
-                vec3 position = level->player->hitbox->position;
+                glm::vec3 position = level->player->hitbox->position;
                 position[ax] = std::stoi(text);
                 level->player->teleport(position);
             } catch (std::invalid_argument& _){
@@ -128,9 +125,9 @@ std::shared_ptr<UINode> HudRenderer::createDebugPanel(Engine* engine) {
             Hitbox* hitbox = level->player->hitbox.get();
             box->setText(std::to_wstring(int(hitbox->position[ax])));
         });
-        box->setSize(vec2(230, 27));
+        box->setSize(glm::vec2(230, 27));
 
-        sub->add(box, vec2(20, 0));
+        sub->add(box, glm::vec2(20, 0));
         panel->add(sub);
     }
     panel->add(create_label([=](){
@@ -156,7 +153,7 @@ std::shared_ptr<UINode> HudRenderer::createDebugPanel(Engine* engine) {
     }
     {
         auto checkbox = std::make_shared<FullCheckBox>(
-            L"Show Chunk Borders", vec2(400, 24)
+            L"Show Chunk Borders", glm::vec2(400, 24)
         );
         checkbox->setSupplier([=]() {
             return engine->getSettings().debug.showChunkBorders;
@@ -237,7 +234,7 @@ HudRenderer::HudRenderer(Engine* engine, LevelFrontend* frontend)
 
     contentAccess = createContentAccess();
     contentAccessPanel = std::make_shared<Panel>(
-        contentAccess->getSize(), vec4(0.0f), 0.0f
+        contentAccess->getSize(), glm::vec4(0.0f), 0.0f
     );
     contentAccessPanel->setColor(glm::vec4());
     contentAccessPanel->add(contentAccess);
@@ -247,8 +244,9 @@ HudRenderer::HudRenderer(Engine* engine, LevelFrontend* frontend)
     darkOverlay = std::make_unique<Panel>(glm::vec2(4000.0f));
     darkOverlay->setColor(glm::vec4(0, 0, 0, 0.5f));
     darkOverlay->setZIndex(-1);
+    darkOverlay->setVisible(false);
 
-    uicamera = std::make_unique<Camera>(vec3(), 1);
+    uicamera = std::make_unique<Camera>(glm::vec3(), 1);
     uicamera->perspective = false;
     uicamera->flipped = true;
 
@@ -265,6 +263,7 @@ HudRenderer::HudRenderer(Engine* engine, LevelFrontend* frontend)
 }
 
 HudRenderer::~HudRenderer() {
+    // removing all controlled ui
     gui->remove(grabbedItemView);
     if (inventoryView) {
         gui->remove(inventoryView);
@@ -287,23 +286,20 @@ void HudRenderer::update(bool visible) {
     auto menu = gui->getMenu();
 
     debugPanel->setVisible(player->debug && visible);
-    menu->setVisible(pause);
 
     if (!visible && inventoryOpen) {
         closeInventory();
     }
     if (pause && menu->getCurrent().panel == nullptr) {
-        pause = false;
+        setPause(false);
     }
     if (Events::jpressed(keycode::ESCAPE) && !gui->isFocusCaught()) {
         if (pause) {
-            pause = false;
-            menu->reset();
+            setPause(false);
         } else if (inventoryOpen) {
             closeInventory();
         } else {
-            pause = true;
-            menu->setPage("pause");
+            setPause(true);
         }
     }
     if (visible && Events::jactive(BIND_HUD_INVENTORY)) {
@@ -319,9 +315,9 @@ void HudRenderer::update(bool visible) {
         Events::toggleCursor();
     }
 
-    vec2 invSize = contentAccessPanel->getSize();
+    glm::vec2 invSize = contentAccessPanel->getSize();
     contentAccessPanel->setVisible(inventoryOpen);
-    contentAccessPanel->setSize(vec2(invSize.x, Window::height));
+    contentAccessPanel->setSize(glm::vec2(invSize.x, Window::height));
     hotbarView->setVisible(visible);
 
     for (int i = keycode::NUM_1; i <= keycode::NUM_9; i++) {
@@ -340,10 +336,11 @@ void HudRenderer::update(bool visible) {
         }
         player->setChosenSlot(slot);
     }
-
-    darkOverlay->setVisible(pause);
 }
 
+/** 
+ * Show inventory on the screen and turn on inventory mode blocking movement
+ */
 void HudRenderer::openInventory() {
     auto level = frontend->getLevel();
     auto player = level->player;
@@ -359,6 +356,9 @@ void HudRenderer::openInventory() {
     gui->add(inventoryView);
 }
 
+/**
+ * Hide inventory and turn off inventory mode
+ */
 void HudRenderer::closeInventory() {
     scripting::on_ui_close(inventoryDocument, inventoryView->getInventory().get());
     inventoryOpen = false;
@@ -371,13 +371,12 @@ void HudRenderer::closeInventory() {
 
 void HudRenderer::draw(const GfxContext& ctx){
     auto level = frontend->getLevel();
+    auto player = level->player;
 
     const Viewport& viewport = ctx.getViewport();
     const uint width = viewport.getWidth();
     const uint height = viewport.getHeight();
 
-    Player* player = level->player;
-
     uicamera->setFov(height);
 
     auto batch = ctx.getBatch2D();
@@ -391,16 +390,21 @@ void HudRenderer::draw(const GfxContext& ctx){
     hotbarView->setSelected(player->getChosenSlot());
 
     // Crosshair
-    batch->begin();
     if (!pause && Events::_cursor_locked && !level->player->debug) {
-        batch->lineWidth(2);
-        batch->line(width/2, height/2-6, width/2, height/2+6, 0.2f, 0.2f, 0.2f, 1.0f);
-        batch->line(width/2+6, height/2, width/2-6, height/2, 0.2f, 0.2f, 0.2f, 1.0f);
-        batch->line(width/2-5, height/2-5, width/2+5, height/2+5, 0.9f, 0.9f, 0.9f, 1.0f);
-        batch->line(width/2+5, height/2-5, width/2-5, height/2+5, 0.9f, 0.9f, 0.9f, 1.0f);
+        GfxContext chctx = ctx.sub();
+        chctx.blendMode(blendmode::inversion);
+        batch->texture(assets->getTexture("gui/crosshair"));
+        int chsize = 16;
+        batch->rect(
+            (width-chsize)/2, (height-chsize)/2, 
+            chsize, chsize, 0,0, 1,1, 1,1,1,1
+        );
+        batch->render();
     }
 
+    // Delta-time visualizer
     if (level->player->debug) {
+        batch->texture(nullptr);
         const int dmwidth = 256;
         const float dmscale = 4000.0f;
         static float deltameter[dmwidth]{};
@@ -417,15 +421,13 @@ void HudRenderer::draw(const GfxContext& ctx){
 
     if (inventoryOpen) {
         float caWidth = contentAccess->getSize().x;
+        contentAccessPanel->setCoord(glm::vec2(width-caWidth, 0));
+
         glm::vec2 invSize = inventoryView->getSize();
-
-        float width = viewport.getWidth();
-
         inventoryView->setCoord(glm::vec2(
             glm::min(width/2-invSize.x/2, width-caWidth-10-invSize.x), 
             height/2-invSize.y/2
         ));
-        contentAccessPanel->setCoord(glm::vec2(width-caWidth, 0));
     }
     grabbedItemView->setCoord(glm::vec2(Events::cursor));
     batch->render();
@@ -438,3 +440,19 @@ bool HudRenderer::isInventoryOpen() const {
 bool HudRenderer::isPause() const {
     return pause;
 }
+
+void HudRenderer::setPause(bool pause) {
+    if (this->pause == pause) {
+        return;
+    }
+    this->pause = pause;
+    
+    auto menu = gui->getMenu();
+    if (pause) {
+        menu->setPage("pause");
+    } else {
+        menu->reset();
+    }
+    darkOverlay->setVisible(pause);
+    menu->setVisible(pause);
+}
diff --git a/src/frontend/hud.h b/src/frontend/hud.h
index f9d12b6a..bb5a3897 100644
--- a/src/frontend/hud.h
+++ b/src/frontend/hud.h
@@ -64,6 +64,7 @@ public:
 
 	bool isInventoryOpen() const;
 	bool isPause() const;
+    void setPause(bool pause);
 
     void openInventory();
     void closeInventory();
diff --git a/src/window/Window.cpp b/src/window/Window.cpp
index b140dbaa..b18405ae 100644
--- a/src/window/Window.cpp
+++ b/src/window/Window.cpp
@@ -175,6 +175,9 @@ void Window::setBlendMode(blendmode mode) {
         case blendmode::addition:
             glBlendFunc(GL_SRC_ALPHA, GL_ONE);
             break;
+        case blendmode::inversion:
+            glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_ALPHA);
+            break;
     }
 }
 
diff --git a/src/window/Window.h b/src/window/Window.h
index 96bd210a..751c2058 100644
--- a/src/window/Window.h
+++ b/src/window/Window.h
@@ -15,7 +15,7 @@ struct DisplaySettings;
 struct GLFWmonitor;
 
 enum class blendmode {
-    normal, addition
+    normal, addition, inversion
 };
 
 class Window {