fix build issues
This commit is contained in:
@@ -194,7 +194,7 @@ private:
|
|||||||
void changeZoneIDValue (int set);
|
void changeZoneIDValue (int set);
|
||||||
|
|
||||||
QPointF _last_mouse_pos;
|
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;
|
float keyx = 0, keyy = 0, keyz = 0, keyr = 0, keys = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -159,7 +159,7 @@ void WMO::finishLoading ()
|
|||||||
assert (fourcc == 'MOGI');
|
assert (fourcc == 'MOGI');
|
||||||
|
|
||||||
groups.reserve(nGroups);
|
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);
|
groups.emplace_back (this, &f, i, groupnames);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -249,6 +249,9 @@ bool World::is_selected(std::uint32_t uid) const
|
|||||||
std::optional<selection_type> World::get_last_selected_model() const
|
std::optional<selection_type> World::get_last_selected_model() const
|
||||||
{
|
{
|
||||||
ZoneScoped;
|
ZoneScoped;
|
||||||
|
if (_current_selection.empty())
|
||||||
|
return std::optional<selection_type>();
|
||||||
|
|
||||||
auto const it
|
auto const it
|
||||||
( std::find_if ( _current_selection.rbegin()
|
( std::find_if ( _current_selection.rbegin()
|
||||||
, _current_selection.rend()
|
, _current_selection.rend()
|
||||||
|
|||||||
2
src/noggit/ui/tools/AssetBrowser/ModelView.cpp → src/noggit/ui/tools/AssetBrowser/BrowserModelView.cpp
Executable file → Normal file
2
src/noggit/ui/tools/AssetBrowser/ModelView.cpp → src/noggit/ui/tools/AssetBrowser/BrowserModelView.cpp
Executable file → Normal file
@@ -1,4 +1,4 @@
|
|||||||
#include "ModelView.hpp"
|
#include "BrowserModelView.hpp"
|
||||||
#include <opengl/scoped.hpp>
|
#include <opengl/scoped.hpp>
|
||||||
#include <noggit/Selection.h>
|
#include <noggit/Selection.h>
|
||||||
#include <noggit/tool_enums.hpp>
|
#include <noggit/tool_enums.hpp>
|
||||||
0
src/noggit/ui/tools/AssetBrowser/ModelView.hpp → src/noggit/ui/tools/AssetBrowser/BrowserModelView.hpp
Executable file → Normal file
0
src/noggit/ui/tools/AssetBrowser/ModelView.hpp → src/noggit/ui/tools/AssetBrowser/BrowserModelView.hpp
Executable file → Normal file
@@ -309,7 +309,7 @@
|
|||||||
<customwidget>
|
<customwidget>
|
||||||
<class>Noggit::Ui::Tools::AssetBrowser::ModelViewer</class>
|
<class>Noggit::Ui::Tools::AssetBrowser::ModelViewer</class>
|
||||||
<extends>QOpenGLWidget</extends>
|
<extends>QOpenGLWidget</extends>
|
||||||
<header location="global">noggit/ui/tools/AssetBrowser/ModelView.hpp</header>
|
<header location="global">noggit/ui/tools/AssetBrowser/BrowserModelView.hpp</header>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<resources/>
|
<resources/>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#define NOGGIT_CONTEXTLOGICNODEBASE_HPP
|
#define NOGGIT_CONTEXTLOGICNODEBASE_HPP
|
||||||
|
|
||||||
#include <noggit/ui/tools/NodeEditor/Nodes/LogicNodeBase.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::PortType;
|
||||||
using QtNodes::PortIndex;
|
using QtNodes::PortIndex;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#define NOGGIT_CONTEXTNODEBASE_HPP
|
#define NOGGIT_CONTEXTNODEBASE_HPP
|
||||||
|
|
||||||
#include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.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::PortType;
|
||||||
using QtNodes::PortIndex;
|
using QtNodes::PortIndex;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
|
#include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
|
||||||
#include <noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp>
|
#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/NodeScene.hpp>
|
||||||
#include <noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp>
|
#include <noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp>
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <external/NodeEditor/include/nodes/Node>
|
#include <external/NodeEditor/include/nodes/Node>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
|
#include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
|
||||||
#include <noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp>
|
#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/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>
|
#include <external/NodeEditor/include/nodes/Node>
|
||||||
|
|
||||||
using namespace Noggit::Ui::Tools::NodeEditor::Nodes;
|
using namespace Noggit::Ui::Tools::NodeEditor::Nodes;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
|
#include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
|
||||||
#include <noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp>
|
#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/NodeScene.hpp>
|
||||||
#include "noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp"
|
#include "noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp"
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <external/NodeEditor/include/nodes/Node>
|
#include <external/NodeEditor/include/nodes/Node>
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
|
#include <noggit/ui/tools/NodeEditor/Nodes/BaseNode.inl>
|
||||||
#include <noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp>
|
#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/NodeScene.hpp>
|
||||||
#include "noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp"
|
#include "noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp"
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
#include <external/NodeEditor/include/nodes/Node>
|
#include <external/NodeEditor/include/nodes/Node>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#define NOGGIT_LOGICPROCEDURENODE_HPP
|
#define NOGGIT_LOGICPROCEDURENODE_HPP
|
||||||
|
|
||||||
#include "noggit/ui/tools/NodeEditor/Nodes/LogicNodeBase.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 <noggit/ui/tools/NodeEditor/Nodes/Scene/NodeScene.hpp>
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#include "NodeScene.hpp"
|
#include "NodeScene.hpp"
|
||||||
#include "LogicBranch.hpp"
|
#include "LogicBranch.hpp"
|
||||||
#include "noggit/ui/tools/NodeEditor/Nodes/BaseNode.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 <external/NodeEditor/include/nodes/Node>
|
||||||
#include <noggit/Log.h>
|
#include <noggit/Log.h>
|
||||||
|
|||||||
2
src/noggit/ui/tools/NodeEditor/Nodes/Scene/Context.cpp → src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.cpp
Executable file → Normal file
2
src/noggit/ui/tools/NodeEditor/Nodes/Scene/Context.cpp → src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.cpp
Executable file → Normal file
@@ -1,6 +1,6 @@
|
|||||||
// This file is part of Noggit3, licensed under GNU General Public License (version 3).
|
// This file is part of Noggit3, licensed under GNU General Public License (version 3).
|
||||||
|
|
||||||
#include "Context.hpp"
|
#include "NodesContext.hpp"
|
||||||
#include "../../NodeRegistry.hpp"
|
#include "../../NodeRegistry.hpp"
|
||||||
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
0
src/noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp → src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp
Executable file → Normal file
0
src/noggit/ui/tools/NodeEditor/Nodes/Scene/Context.hpp → src/noggit/ui/tools/NodeEditor/Nodes/Scene/NodesContext.hpp
Executable file → Normal file
@@ -3,7 +3,7 @@
|
|||||||
#include "NodeEditor.hpp"
|
#include "NodeEditor.hpp"
|
||||||
#include <noggit/ui/FramelessWindow.hpp>
|
#include <noggit/ui/FramelessWindow.hpp>
|
||||||
#include <noggit/ui/FontAwesome.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/ui/tools/NodeEditor/Nodes/BaseNode.hpp>
|
||||||
#include <noggit/Log.h>
|
#include <noggit/Log.h>
|
||||||
#include <noggit/MapView.h>
|
#include <noggit/MapView.h>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#ifndef NOGGIT_MODELVIEW_HPP
|
#ifndef NOGGIT_BROWSER_MODELVIEW_HPP
|
||||||
#define NOGGIT_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/QtImGui.h>
|
||||||
#include <external/qtimgui/imgui/imgui.h>
|
#include <external/qtimgui/imgui/imgui.h>
|
||||||
#include <external/imguizmo/ImGuizmo.h>
|
#include <external/imguizmo/ImGuizmo.h>
|
||||||
@@ -15,7 +15,7 @@ namespace Noggit
|
|||||||
{
|
{
|
||||||
namespace Ui::Tools::PresetEditor
|
namespace Ui::Tools::PresetEditor
|
||||||
{
|
{
|
||||||
class ModelViewer : public Ui::Tools::AssetBrowser::ModelViewer
|
class ModelViewer : public Noggit::Ui::Tools::AssetBrowser::ModelViewer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit ModelViewer(QWidget* parent = nullptr);
|
explicit ModelViewer(QWidget* parent = nullptr);
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ PresetEditorWidget::PresetEditorWidget(std::shared_ptr<Project::NoggitProject> p
|
|||||||
|
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
_project->ClientDatabase->UnloadTable("map");
|
_project->ClientDatabase->UnloadTable("Map");
|
||||||
|
|
||||||
|
|
||||||
// Handle minimap widget
|
// Handle minimap widget
|
||||||
|
|||||||
@@ -296,7 +296,7 @@ void ViewportGizmo::handleTransformGizmo(MapView* map_view
|
|||||||
_world->updateTilesEntry(selected, model_update::add);
|
_world->updateTilesEntry(selected, model_update::add);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (_world)
|
||||||
_world->update_selected_model_groups();
|
_world->update_selected_model_groups();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user