fix build issues

This commit is contained in:
T1ti
2024-05-04 03:22:11 +02:00
parent 83790a38cc
commit 49fff1ea4d
20 changed files with 24 additions and 21 deletions

View File

@@ -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;

View File

@@ -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);
}

View File

@@ -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()

View File

@@ -1,4 +1,4 @@
#include "ModelView.hpp"
#include "BrowserModelView.hpp"
#include <opengl/scoped.hpp>
#include <noggit/Selection.h>
#include <noggit/tool_enums.hpp>

View File

@@ -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/>

View File

@@ -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;

View File

@@ -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;

View File

@@ -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>

View File

@@ -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;

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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);

View File

@@ -98,7 +98,7 @@ PresetEditorWidget::PresetEditorWidget(std::shared_ptr<Project::NoggitProject> p
count++;
}
_project->ClientDatabase->UnloadTable("map");
_project->ClientDatabase->UnloadTable("Map");
// Handle minimap widget

View File

@@ -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();
}