From 49fff1ea4d1c95ffe07bbe9f594882d9480db04e Mon Sep 17 00:00:00 2001
From: T1ti <40864460+T1ti@users.noreply.github.com>
Date: Sat, 4 May 2024 03:22:11 +0200
Subject: [PATCH] fix build issues

---
 src/noggit/MapView.h                                      | 2 +-
 src/noggit/WMO.cpp                                        | 2 +-
 src/noggit/World.cpp                                      | 3 +++
 .../AssetBrowser/{ModelView.cpp => BrowserModelView.cpp}  | 2 +-
 .../AssetBrowser/{ModelView.hpp => BrowserModelView.hpp}  | 0
 src/noggit/ui/tools/AssetBrowser/Ui/AssetBrowser.ui       | 2 +-
 .../ui/tools/NodeEditor/Nodes/ContextLogicNodeBase.hpp    | 2 +-
 src/noggit/ui/tools/NodeEditor/Nodes/ContextNodeBase.hpp  | 2 +-
 .../ui/tools/NodeEditor/Nodes/Data/DeleteVariableNode.cpp | 2 +-
 .../tools/NodeEditor/Nodes/Data/GetVariableLazyNode.cpp   | 2 +-
 .../ui/tools/NodeEditor/Nodes/Data/GetVariableNode.cpp    | 2 +-
 .../ui/tools/NodeEditor/Nodes/Data/SetVariableNode.cpp    | 2 +-
 .../tools/NodeEditor/Nodes/Logic/LogicProcedureNode.hpp   | 2 +-
 src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodeScene.cpp  | 2 +-
 .../Nodes/Scene/{Context.cpp => NodesContext.cpp}         | 2 +-
 .../Nodes/Scene/{Context.hpp => NodesContext.hpp}         | 0
 src/noggit/ui/tools/NodeEditor/Ui/NodeEditor.cpp          | 2 +-
 src/noggit/ui/tools/PresetEditor/ModelView.hpp            | 8 ++++----
 src/noggit/ui/tools/PresetEditor/Ui/PresetEditor.cpp      | 2 +-
 src/noggit/ui/tools/ViewportGizmo/ViewportGizmo.cpp       | 4 ++--
 20 files changed, 24 insertions(+), 21 deletions(-)
 rename src/noggit/ui/tools/AssetBrowser/{ModelView.cpp => BrowserModelView.cpp} (99%)
 mode change 100755 => 100644
 rename src/noggit/ui/tools/AssetBrowser/{ModelView.hpp => BrowserModelView.hpp} (100%)
 mode change 100755 => 100644
 rename src/noggit/ui/tools/NodeEditor/Nodes/Scene/{Context.cpp => NodesContext.cpp} (97%)
 mode change 100755 => 100644
 rename src/noggit/ui/tools/NodeEditor/Nodes/Scene/{Context.hpp => NodesContext.hpp} (100%)
 mode change 100755 => 100644

diff --git a/src/noggit/MapView.h b/src/noggit/MapView.h
index 18991619..73e49de8 100755
--- a/src/noggit/MapView.h
+++ b/src/noggit/MapView.h
@@ -194,7 +194,7 @@ private:
   void changeZoneIDValue (int set);
 
   QPointF _last_mouse_pos;
-  float mh, mv, rh, rv;
+  float mh, mv, rh, rv; // mh = left click x, rv = right click y
 
   float keyx = 0, keyy = 0, keyz = 0, keyr = 0, keys = 0;
 
diff --git a/src/noggit/WMO.cpp b/src/noggit/WMO.cpp
index cd098449..12e89a65 100755
--- a/src/noggit/WMO.cpp
+++ b/src/noggit/WMO.cpp
@@ -159,7 +159,7 @@ void WMO::finishLoading ()
   assert (fourcc == 'MOGI');
 
   groups.reserve(nGroups);
-  for (int i (0); i < nGroups; ++i) {
+  for (unsigned int i (0); i < nGroups; ++i) {
     groups.emplace_back (this, &f, i, groupnames);
   }
 
diff --git a/src/noggit/World.cpp b/src/noggit/World.cpp
index 8dbcc8f9..864ffffc 100755
--- a/src/noggit/World.cpp
+++ b/src/noggit/World.cpp
@@ -249,6 +249,9 @@ bool World::is_selected(std::uint32_t uid) const
 std::optional<selection_type> World::get_last_selected_model() const
 {
   ZoneScoped;
+  if (_current_selection.empty())
+      return std::optional<selection_type>();
+
   auto const it
     ( std::find_if ( _current_selection.rbegin()
                    , _current_selection.rend()
diff --git a/src/noggit/ui/tools/AssetBrowser/ModelView.cpp b/src/noggit/ui/tools/AssetBrowser/BrowserModelView.cpp
old mode 100755
new mode 100644
similarity index 99%
rename from src/noggit/ui/tools/AssetBrowser/ModelView.cpp
rename to src/noggit/ui/tools/AssetBrowser/BrowserModelView.cpp
index 7fd07780..e3a24642
--- a/src/noggit/ui/tools/AssetBrowser/ModelView.cpp
+++ b/src/noggit/ui/tools/AssetBrowser/BrowserModelView.cpp
@@ -1,4 +1,4 @@
-#include "ModelView.hpp"
+#include "BrowserModelView.hpp"
 #include <opengl/scoped.hpp>
 #include <noggit/Selection.h>
 #include <noggit/tool_enums.hpp>
diff --git a/src/noggit/ui/tools/AssetBrowser/ModelView.hpp b/src/noggit/ui/tools/AssetBrowser/BrowserModelView.hpp
old mode 100755
new mode 100644
similarity index 100%
rename from src/noggit/ui/tools/AssetBrowser/ModelView.hpp
rename to src/noggit/ui/tools/AssetBrowser/BrowserModelView.hpp
diff --git a/src/noggit/ui/tools/AssetBrowser/Ui/AssetBrowser.ui b/src/noggit/ui/tools/AssetBrowser/Ui/AssetBrowser.ui
index 5fb46835..7d8db540 100755
--- a/src/noggit/ui/tools/AssetBrowser/Ui/AssetBrowser.ui
+++ b/src/noggit/ui/tools/AssetBrowser/Ui/AssetBrowser.ui
@@ -309,7 +309,7 @@
   <customwidget>
    <class>Noggit::Ui::Tools::AssetBrowser::ModelViewer</class>
    <extends>QOpenGLWidget</extends>
-   <header location="global">noggit/ui/tools/AssetBrowser/ModelView.hpp</header>
+   <header location="global">noggit/ui/tools/AssetBrowser/BrowserModelView.hpp</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/ContextLogicNodeBase.hpp b/src/noggit/ui/tools/NodeEditor/Nodes/ContextLogicNodeBase.hpp
index fbc2de0d..30695002 100755
--- a/src/noggit/ui/tools/NodeEditor/Nodes/ContextLogicNodeBase.hpp
+++ b/src/noggit/ui/tools/NodeEditor/Nodes/ContextLogicNodeBase.hpp
@@ -4,7 +4,7 @@
 #define NOGGIT_CONTEXTLOGICNODEBASE_HPP
 
 #include <noggit/ui/tools/NodeEditor/Nodes/LogicNodeBase.hpp>
-#include <noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp>
+#include <noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp>
 
 using QtNodes::PortType;
 using QtNodes::PortIndex;
diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/ContextNodeBase.hpp b/src/noggit/ui/tools/NodeEditor/Nodes/ContextNodeBase.hpp
index 32afd76b..c8e65542 100755
--- a/src/noggit/ui/tools/NodeEditor/Nodes/ContextNodeBase.hpp
+++ b/src/noggit/ui/tools/NodeEditor/Nodes/ContextNodeBase.hpp
@@ -4,7 +4,7 @@
 #define NOGGIT_CONTEXTNODEBASE_HPP
 
 #include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.hpp>
-#include <noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp>
+#include <noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp>
 
 using QtNodes::PortType;
 using QtNodes::PortIndex;
diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/Data/DeleteVariableNode.cpp b/src/noggit/ui/tools/NodeEditor/Nodes/Data/DeleteVariableNode.cpp
index ae036ab0..cc777941 100755
--- a/src/noggit/ui/tools/NodeEditor/Nodes/Data/DeleteVariableNode.cpp
+++ b/src/noggit/ui/tools/NodeEditor/Nodes/Data/DeleteVariableNode.cpp
@@ -5,7 +5,7 @@
 #include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
 #include <noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp>
 #include <noggit/ui/tools/NodeEditor/Nodes/Scene/NodeScene.hpp>
-#include <noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp>
+#include <noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp>
 
 #include <sstream>
 #include <external/NodeEditor/include/nodes/Node>
diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/Data/GetVariableLazyNode.cpp b/src/noggit/ui/tools/NodeEditor/Nodes/Data/GetVariableLazyNode.cpp
index 3de61040..6b077307 100755
--- a/src/noggit/ui/tools/NodeEditor/Nodes/Data/GetVariableLazyNode.cpp
+++ b/src/noggit/ui/tools/NodeEditor/Nodes/Data/GetVariableLazyNode.cpp
@@ -5,7 +5,7 @@
 #include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
 #include <noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp>
 #include <noggit/ui/tools/NodeEditor/Nodes/Scene/NodeScene.hpp>
-#include "noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp"
+#include "noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp"
 #include <external/NodeEditor/include/nodes/Node>
 
 using namespace Noggit::Ui::Tools::NodeEditor::Nodes;
diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/Data/GetVariableNode.cpp b/src/noggit/ui/tools/NodeEditor/Nodes/Data/GetVariableNode.cpp
index 5aed1fb5..0de45aa9 100755
--- a/src/noggit/ui/tools/NodeEditor/Nodes/Data/GetVariableNode.cpp
+++ b/src/noggit/ui/tools/NodeEditor/Nodes/Data/GetVariableNode.cpp
@@ -5,7 +5,7 @@
 #include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
 #include <noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp>
 #include <noggit/ui/tools/NodeEditor/Nodes/Scene/NodeScene.hpp>
-#include "noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp"
+#include "noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp"
 #include <sstream>
 #include <external/NodeEditor/include/nodes/Node>
 
diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/Data/SetVariableNode.cpp b/src/noggit/ui/tools/NodeEditor/Nodes/Data/SetVariableNode.cpp
index bafeed3e..ba0a593d 100755
--- a/src/noggit/ui/tools/NodeEditor/Nodes/Data/SetVariableNode.cpp
+++ b/src/noggit/ui/tools/NodeEditor/Nodes/Data/SetVariableNode.cpp
@@ -5,7 +5,7 @@
 #include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
 #include <noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp>
 #include <noggit/ui/tools/NodeEditor/Nodes/Scene/NodeScene.hpp>
-#include "noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp"
+#include "noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp"
 #include <sstream>
 
 #include <external/NodeEditor/include/nodes/Node>
diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/Logic/LogicProcedureNode.hpp b/src/noggit/ui/tools/NodeEditor/Nodes/Logic/LogicProcedureNode.hpp
index 4db72472..430474cf 100755
--- a/src/noggit/ui/tools/NodeEditor/Nodes/Logic/LogicProcedureNode.hpp
+++ b/src/noggit/ui/tools/NodeEditor/Nodes/Logic/LogicProcedureNode.hpp
@@ -4,7 +4,7 @@
 #define NOGGIT_LOGICPROCEDURENODE_HPP
 
 #include "noggit/ui/tools/NodeEditor/Nodes/LogicNodeBase.hpp"
-#include "noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp"
+#include "noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp"
 #include <noggit/ui/tools/NodeEditor/Nodes/Scene/NodeScene.hpp>
 
 #include <vector>
diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodeScene.cpp b/src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodeScene.cpp
index 21020d9c..3494e9ff 100755
--- a/src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodeScene.cpp
+++ b/src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodeScene.cpp
@@ -1,7 +1,7 @@
 #include "NodeScene.hpp"
 #include "LogicBranch.hpp"
 #include "noggit/ui/tools/NodeEditor/Nodes/BaseNode.hpp"
-#include "noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp"
+#include "noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp"
 
 #include <external/NodeEditor/include/nodes/Node>
 #include <noggit/Log.h>
diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/Scene/Context.cpp b/src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.cpp
old mode 100755
new mode 100644
similarity index 97%
rename from src/noggit/ui/tools/NodeEditor/Nodes/Scene/Context.cpp
rename to src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.cpp
index 27ea5274..a2d4dfab
--- a/src/noggit/ui/tools/NodeEditor/Nodes/Scene/Context.cpp
+++ b/src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.cpp
@@ -1,6 +1,6 @@
 // This file is part of Noggit3, licensed under GNU General Public License (version 3).
 
-#include "Context.hpp"
+#include "NodesContext.hpp"
 #include "../../NodeRegistry.hpp"
 
 #include <QDir>
diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp b/src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp
old mode 100755
new mode 100644
similarity index 100%
rename from src/noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp
rename to src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp
diff --git a/src/noggit/ui/tools/NodeEditor/Ui/NodeEditor.cpp b/src/noggit/ui/tools/NodeEditor/Ui/NodeEditor.cpp
index 9534adc2..e11d5cb5 100755
--- a/src/noggit/ui/tools/NodeEditor/Ui/NodeEditor.cpp
+++ b/src/noggit/ui/tools/NodeEditor/Ui/NodeEditor.cpp
@@ -3,7 +3,7 @@
 #include "NodeEditor.hpp"
 #include <noggit/ui/FramelessWindow.hpp>
 #include <noggit/ui/FontAwesome.hpp>
-#include <noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp>
+#include <noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp>
 #include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.hpp>
 #include <noggit/Log.h>
 #include <noggit/MapView.h>
diff --git a/src/noggit/ui/tools/PresetEditor/ModelView.hpp b/src/noggit/ui/tools/PresetEditor/ModelView.hpp
index e7bfc8e7..1eff6b1e 100755
--- a/src/noggit/ui/tools/PresetEditor/ModelView.hpp
+++ b/src/noggit/ui/tools/PresetEditor/ModelView.hpp
@@ -1,7 +1,7 @@
-#ifndef NOGGIT_MODELVIEW_HPP
-#define NOGGIT_MODELVIEW_HPP
+#ifndef NOGGIT_BROWSER_MODELVIEW_HPP
+#define NOGGIT_BROWSER_MODELVIEW_HPP
 
-#include <noggit/ui/tools/AssetBrowser/ModelView.hpp>
+#include <noggit/ui/tools/AssetBrowser/BrowserModelView.hpp>
 #include <external/qtimgui/QtImGui.h>
 #include <external/qtimgui/imgui/imgui.h>
 #include <external/imguizmo/ImGuizmo.h>
@@ -15,7 +15,7 @@ namespace Noggit
 {
   namespace Ui::Tools::PresetEditor
   {
-    class ModelViewer : public Ui::Tools::AssetBrowser::ModelViewer
+    class ModelViewer : public Noggit::Ui::Tools::AssetBrowser::ModelViewer
     {
     public:
         explicit ModelViewer(QWidget* parent = nullptr);
diff --git a/src/noggit/ui/tools/PresetEditor/Ui/PresetEditor.cpp b/src/noggit/ui/tools/PresetEditor/Ui/PresetEditor.cpp
index ea4b9cb2..0b82ec33 100755
--- a/src/noggit/ui/tools/PresetEditor/Ui/PresetEditor.cpp
+++ b/src/noggit/ui/tools/PresetEditor/Ui/PresetEditor.cpp
@@ -98,7 +98,7 @@ PresetEditorWidget::PresetEditorWidget(std::shared_ptr<Project::NoggitProject> p
 
       count++;
   }
-  _project->ClientDatabase->UnloadTable("map");
+  _project->ClientDatabase->UnloadTable("Map");
 
 
   // Handle minimap widget
diff --git a/src/noggit/ui/tools/ViewportGizmo/ViewportGizmo.cpp b/src/noggit/ui/tools/ViewportGizmo/ViewportGizmo.cpp
index a3aa08c5..d1cd2882 100755
--- a/src/noggit/ui/tools/ViewportGizmo/ViewportGizmo.cpp
+++ b/src/noggit/ui/tools/ViewportGizmo/ViewportGizmo.cpp
@@ -296,7 +296,7 @@ void ViewportGizmo::handleTransformGizmo(MapView* map_view
         _world->updateTilesEntry(selected, model_update::add);
     }
   }
-
-  _world->update_selected_model_groups();
+  if (_world)
+    _world->update_selected_model_groups();
 }