progress

Author: Jernesstar

Magma/src/Editor/Editor/AssetManager.cpp

@@ -224,8 +224,7 @@ EditorAssetManager::EditorAssetManager() {
 }
 
 EditorAssetManager::~EditorAssetManager() {
-	s_WatcherIDs.ForEach([](auto& id) { s_FileWatcher->removeWatch(id); });
-	s_WatcherIDs.Clear();
+	Clear();
 	delete s_Listener;
 	delete s_FileWatcher;
 }
@@ -357,6 +356,15 @@ std::string EditorAssetManager::GetPath(UUID id) const {
 	return m_Paths.at(id);
 }
 
+void EditorAssetManager::Clear() {
+	AssetManager::Clear();
+	m_Path = "";
+	m_Paths.clear();
+
+	s_WatcherIDs.ForEach([](auto& id) { s_FileWatcher->removeWatch(id); });
+	s_WatcherIDs.Clear();
+}
+
 void EditorAssetManager::Load(const std::string& path) {
 	auto rootPath = fs::path(path) / "Asset";
 	m_Path = (rootPath / ".magma.assetpk").string();

Magma/src/Editor/Editor/AssetManager.h

@@ -26,6 +26,7 @@ class EditorAssetManager : public AssetManager {
 
 	const auto& GetRegistry() const { return m_AssetRegistry; }
 
+	void Clear() override;
 	void Load(const std::string& path);
 	void Save();
 	void RuntimeSave(const std::string& exportPath);

Magma/src/Editor/Editor/Editor.cpp

@@ -60,6 +60,7 @@ void Editor::Open() {
 	ScriptEngine::Init();
 
 	Lava::ScriptGlue::RegisterInterface();
+	m_App = CreateRef<Lava::App>();
 
 	Application::PushDir();
 	m_WelcomeImage.Content =
@@ -69,7 +70,6 @@ void Editor::Open() {
 
 void Editor::Close() {
 	CloseProject();
-
 	m_App.reset();
 
 	ScriptEngine::Shutdown();
@@ -78,8 +78,6 @@ void Editor::Close() {
 }
 
 void Editor::Load(const CommandLineArgs& args) {
-	m_App = CreateRef<Lava::App>();
-
 	if(args["--project"]) {
 		NewProject(args["--project"]);
 

Magma/src/Editor/Editor/EditorApp.cpp

@@ -91,6 +91,7 @@ EditorApp::EditorApp(const CommandLineArgs& args)
 	io.FontDefault =
 		io.Fonts->AddFontFromFileTTF(
 			"Magma/assets/fonts/JetBrainsMono-Regular.ttf", fontSize);
+	io.IniFilename = nullptr;
 
 	Application::PopDir();
 

Magma/src/Magma/Core/AssetManager.h

@@ -140,16 +140,19 @@ class AssetManager : public VolcaniCore::Derivable<AssetManager> {
 		return { };
 	}
 
-	void Clear() {
+	virtual void Clear() {
 		m_AssetRegistry.clear();
 		m_References.clear();
+		m_NamedAssets.clear();
 
 		m_MeshAssets.clear();
 		m_TextureAssets.clear();
 		m_CubemapAssets.clear();
 		m_ShaderAssets.clear();
+		// m_FontAssets.clear();
 		m_AudioAssets.clear();
 		m_ScriptAssets.clear();
+		m_MaterialAssets.clear();
 	}
 
 protected:

TestProj/Editor/layout.ini

@@ -66412,6 +66412,18 @@ Column 0  Sort=0v
 RefScale=15
 Column 0  Sort=0v
 
+[Table][0xAAC6A9CA,4]
+RefScale=15
+Column 0  Sort=0v
+
+[Table][0x02360320,4]
+RefScale=15
+Column 0  Sort=0v
+
+[Table][0xE56A46E4,4]
+RefScale=15
+Column 0  Sort=0v
+
 [Docking][Data]
 DockSpace               ID=0xF15DEC6E Window=0x41896AB8 Pos=0,67 Size=1600,833 Split=X Selected=0xBDDC88E0
   DockNode              ID=0x00000001 Parent=0xF15DEC6E SizeRef=354,832 Split=Y Selected=0x2E9237F7

VolcaniCore/.builddeps/glfw.lua

@@ -27,7 +27,7 @@ project "glfw"
     }
 
     defines {
-        "GLFW_USE_HYBRID_HPG"
+        "_GLFW_USE_HYBRID_HPG"
     }
 
     filter "system:windows"

docs/index.md

@@ -2,7 +2,7 @@
 title: Home
 layout: home
 nav_order: 1
-description: "Just the Docs is a responsive Jekyll theme with built-in search that is easily customizable and hosted on GitHub Pages."
+description: "The VolcanicEngine Documentation"
 permalink: /
 ---
 

imgui.ini

@@ -1,5 +1,4 @@
 [Window][DockSpaceWindow]
-Pos=0,0
 Size=1600,877
 Collapsed=0
 
@@ -66413,7 +66412,7 @@ RefScale=15
 Column 0  Sort=0v
 
 [Docking][Data]
-DockSpace               ID=0xF15DEC6E Window=0x41896AB8 Pos=0,44 Size=1600,856 Split=X Selected=0xBDDC88E0
+DockSpace               ID=0xF15DEC6E Pos=0,44 Size=1600,856 Split=X Selected=0xBDDC88E0
   DockNode              ID=0x00000001 Parent=0xF15DEC6E SizeRef=354,832 Split=Y Selected=0x2E9237F7
     DockNode            ID=0x00000003 Parent=0x00000001 SizeRef=218,525 Selected=0x2E9237F7
     DockNode            ID=0x00000004 Parent=0x00000001 SizeRef=218,486 Selected=0xF4B38336

scripts/Unix/build.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cd build/gmake2/
-make -f Makefile
+mingw32-make.exe -f Makefile