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:
EditorAssetsWindow();
EditorAssetsWindow(EditorBaseApplication* app);
void ImportAsset();

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

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

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

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

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

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

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

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

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

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

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

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

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

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