sid
/
NazaraEditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updating Windows with new ctor

This commit is contained in:
SweetId 2023-10-08 22:33:02 -04:00
parent 1cedfc0419
commit db5e70a27f
8 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/NazaraEditor/Editor/UI/AssetsWindow.hpp
View File

@ -6,7 +6,7 @@ namespace Nz
: public Nz::EditorWindow : public Nz::EditorWindow
{ {
public: public:
EditorAssetsWindow(); EditorAssetsWindow(EditorBaseApplication* app);
void ImportAsset(); void ImportAsset();

2
include/NazaraEditor/Editor/UI/InspectorWindow.hpp
View File

@ -8,7 +8,7 @@ namespace Nz
: public Nz::EditorWindow : public Nz::EditorWindow
{ {
public: public:
EditorInspectorWindow(); EditorInspectorWindow(EditorBaseApplication* app);
virtual void OnEditorGUI() override; virtual void OnEditorGUI() override;

2
include/NazaraEditor/Editor/UI/LevelWindow.hpp
View File

@ -9,7 +9,7 @@ namespace Nz
: public Nz::EditorWindow : public Nz::EditorWindow
{ {
public: public:
EditorLevelWindow(); EditorLevelWindow(EditorBaseApplication* app);
virtual void OnEditorGUI() override; virtual void OnEditorGUI() override;

2
include/NazaraEditor/Editor/UI/MainWindow.hpp
View File

@ -6,7 +6,7 @@ namespace Nz
: public Nz::EditorWindow : public Nz::EditorWindow
{ {
public: public:
EditorMainWindow(); EditorMainWindow(EditorBaseApplication* app);
bool Quit(); bool Quit();

4
src/NazaraEditor/Editor/UI/AssetsWindow.cpp
View File

@ -2,8 +2,8 @@
namespace Nz namespace Nz
{ {
EditorAssetsWindow::EditorAssetsWindow() EditorAssetsWindow::EditorAssetsWindow(EditorBaseApplication* app)
: Nz::EditorWindow("Assets Browser") : Nz::EditorWindow(app, "Assets Browser")
{ {
BuildMenuBar(); BuildMenuBar();
} }

6
src/NazaraEditor/Editor/UI/InspectorWindow.cpp
View File

@ -4,10 +4,10 @@
namespace Nz namespace Nz
{ {
EditorInspectorWindow::EditorInspectorWindow() EditorInspectorWindow::EditorInspectorWindow(EditorBaseApplication* app)
: Nz::EditorWindow("Inspector") : Nz::EditorWindow(app, "Inspector")
{ {
EditorApplication::Instance().OnEntitySelected.Connect(this, &EditorInspectorWindow::OnEntitySelected); app->OnEntitySelected.Connect(this, &EditorInspectorWindow::OnEntitySelected);
} }
void EditorInspectorWindow::OnEditorGUI() void EditorInspectorWindow::OnEditorGUI()

14
src/NazaraEditor/Editor/UI/LevelWindow.cpp
View File

@ -4,15 +4,15 @@
namespace Nz namespace Nz
{ {
EditorLevelWindow::EditorLevelWindow() EditorLevelWindow::EditorLevelWindow(EditorBaseApplication* app)
: Nz::EditorWindow("Level") : Nz::EditorWindow(app, "Level")
, m_currentWorld(EditorApplication::Instance().GetCurrentWorld()) , m_currentWorld(app->GetCurrentWorld())
, m_dirty(true) , m_dirty(true)
{ {
EditorApplication::Instance().OnWorldChanged.Connect([this](Nz::EnttWorld* world) { m_currentWorld = world; m_dirty = true; }); app->OnWorldChanged.Connect([this](Nz::EnttWorld* world) { m_currentWorld = world; m_dirty = true; });
EditorApplication::Instance().OnEntityCreated.Connect([this](entt::handle) { m_dirty = true; }); app->OnEntityCreated.Connect([this](entt::handle) { m_dirty = true; });
EditorApplication::Instance().OnEntityDestroyed.Connect([this](entt::handle) { m_dirty = true; }); app->OnEntityDestroyed.Connect([this](entt::handle) { m_dirty = true; });
EditorApplication::Instance().OnEntityParentChanged.Connect([this](entt::handle) { m_dirty = true; }); app->OnEntityParentChanged.Connect([this](entt::handle) { m_dirty = true; });
} }
void EditorLevelWindow::OnEditorGUI() void EditorLevelWindow::OnEditorGUI()

9
src/NazaraEditor/Editor/UI/MainWindow.cpp
View File

@ -2,8 +2,8 @@
namespace Nz namespace Nz
{ {
EditorMainWindow::EditorMainWindow() EditorMainWindow::EditorMainWindow(EditorBaseApplication* app)
: Nz::EditorWindow("MainWindow") : Nz::EditorWindow(app, "MainWindow")
{ {
BuildMenuBar(); BuildMenuBar();
} }
@ -20,11 +20,6 @@ namespace Nz
AddMenuAction("File|Quit", "Ctrl+W", [this]() { Quit(); }); AddMenuAction("File|Quit", "Ctrl+W", [this]() { Quit(); });
} }
void EditorMainWindow::OnEditorGUI()
{
}
bool EditorMainWindow::Quit() bool EditorMainWindow::Quit()
{ {
return true; return true;