From e1813870a231118b2c79a018f76c79d7f64c841a Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Wed, 4 Sep 2024 16:38:52 -0400 Subject: [PATCH] Fixedruntime refact --- Editor/src/Windows/FileSystemUI.cpp | 3 ++- Nuake/src/Core/OS.cpp | 1 + Nuake/src/FileSystem/File.h | 4 +++- Nuake/src/Resource/ResourceLoader.h | 1 + Nuake/src/Scene/Scene.cpp | 1 + Runtime/Runtime.cpp | 7 ++++++- 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Editor/src/Windows/FileSystemUI.cpp b/Editor/src/Windows/FileSystemUI.cpp index 8b84e9f3..21f066bf 100644 --- a/Editor/src/Windows/FileSystemUI.cpp +++ b/Editor/src/Windows/FileSystemUI.cpp @@ -13,6 +13,8 @@ #include #include "../Misc/PopupHelper.h" #include +#include +#include #include "src/Scene/Systems/WadConverter.h" #include "../Misc/ThumbnailManager.h" @@ -22,7 +24,6 @@ namespace Nuake { Ref FileSystemUI::m_CurrentDirectory; - // TODO: add filetree in same panel void FileSystemUI::Draw() { diff --git a/Nuake/src/Core/OS.cpp b/Nuake/src/Core/OS.cpp index 03a91b2f..c9cac313 100644 --- a/Nuake/src/Core/OS.cpp +++ b/Nuake/src/Core/OS.cpp @@ -21,6 +21,7 @@ #endif #include "src/FileSystem/File.h" +#include "src/FileSystem/Directory.h" #include "GLFW/glfw3.h" #include "GLFW/glfw3native.h" diff --git a/Nuake/src/FileSystem/File.h b/Nuake/src/FileSystem/File.h index 1a8489a6..ad39b59b 100644 --- a/Nuake/src/FileSystem/File.h +++ b/Nuake/src/FileSystem/File.h @@ -1,11 +1,13 @@ #pragma once #include "src/Core/Core.h" -#include "Directory.h" + #include "FileTypes.h" namespace Nuake { + class Directory; + class File { public: diff --git a/Nuake/src/Resource/ResourceLoader.h b/Nuake/src/Resource/ResourceLoader.h index e8f74c05..e5304960 100644 --- a/Nuake/src/Resource/ResourceLoader.h +++ b/Nuake/src/Resource/ResourceLoader.h @@ -21,6 +21,7 @@ namespace Nuake static Ref LoadMaterial(const std::string& path); static Ref LoadModel(const std::string& path); + static Ref LoadTexture(const std::string& path); private: static UUID ReadUUID(json j); diff --git a/Nuake/src/Scene/Scene.cpp b/Nuake/src/Scene/Scene.cpp index dc5a6689..ab05e890 100644 --- a/Nuake/src/Scene/Scene.cpp +++ b/Nuake/src/Scene/Scene.cpp @@ -491,6 +491,7 @@ namespace Nuake if (!cam) cam = m_EditorCamera; + return cam; } diff --git a/Runtime/Runtime.cpp b/Runtime/Runtime.cpp index 6ab8f781..17f960c0 100644 --- a/Runtime/Runtime.cpp +++ b/Runtime/Runtime.cpp @@ -1,5 +1,10 @@ #include -#include "src/Core/FileSystem.h" +#include "src/FileSystem/FileSystem.h" + +#include "src/FileSystem/File.h" +#include "src/FileSystem/Directory.h" +#include "src/Core/String.h" +#include "src/Resource/Project.h" //#include #include