diff --git a/Editor/.editorconfig b/Editor/.editorconfig
deleted file mode 100644
index 5193542d..00000000
--- a/Editor/.editorconfig
+++ /dev/null
@@ -1,69 +0,0 @@
-# Visual Studio generated .editorconfig file with C++ settings.
-root = true
-
-[*.{c++,cc,cpp,cppm,cu,cuh,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}]
-
-# Visual C++ Code Style settings
-
-cpp_generate_documentation_comments = xml
-
-# Visual C++ Formatting settings
-
-cpp_indent_braces = false
-cpp_indent_multi_line_relative_to = innermost_parenthesis
-cpp_indent_within_parentheses = indent
-cpp_indent_preserve_within_parentheses = true
-cpp_indent_case_contents = true
-cpp_indent_case_labels = false
-cpp_indent_case_contents_when_block = false
-cpp_indent_lambda_braces_when_parameter = true
-cpp_indent_goto_labels = one_left
-cpp_indent_preprocessor = leftmost_column
-cpp_indent_access_specifiers = false
-cpp_indent_namespace_contents = true
-cpp_indent_preserve_comments = false
-cpp_new_line_before_open_brace_namespace = ignore
-cpp_new_line_before_open_brace_type = ignore
-cpp_new_line_before_open_brace_function = ignore
-cpp_new_line_before_open_brace_block = ignore
-cpp_new_line_before_open_brace_lambda = ignore
-cpp_new_line_scope_braces_on_separate_lines = false
-cpp_new_line_close_brace_same_line_empty_type = false
-cpp_new_line_close_brace_same_line_empty_function = false
-cpp_new_line_before_catch = true
-cpp_new_line_before_else = true
-cpp_new_line_before_while_in_do_while = false
-cpp_space_before_function_open_parenthesis = remove
-cpp_space_within_parameter_list_parentheses = false
-cpp_space_between_empty_parameter_list_parentheses = false
-cpp_space_after_keywords_in_control_flow_statements = true
-cpp_space_within_control_flow_statement_parentheses = false
-cpp_space_before_lambda_open_parenthesis = false
-cpp_space_within_cast_parentheses = false
-cpp_space_after_cast_close_parenthesis = false
-cpp_space_within_expression_parentheses = false
-cpp_space_before_block_open_brace = true
-cpp_space_between_empty_braces = false
-cpp_space_before_initializer_list_open_brace = false
-cpp_space_within_initializer_list_braces = true
-cpp_space_preserve_in_initializer_list = true
-cpp_space_before_open_square_bracket = false
-cpp_space_within_square_brackets = false
-cpp_space_before_empty_square_brackets = false
-cpp_space_between_empty_square_brackets = false
-cpp_space_group_square_brackets = true
-cpp_space_within_lambda_brackets = false
-cpp_space_between_empty_lambda_brackets = false
-cpp_space_before_comma = false
-cpp_space_after_comma = true
-cpp_space_remove_around_member_operators = true
-cpp_space_before_inheritance_colon = true
-cpp_space_before_constructor_colon = true
-cpp_space_remove_before_semicolon = true
-cpp_space_after_semicolon = true
-cpp_space_remove_around_unary_operator = true
-cpp_space_around_binary_operator = insert
-cpp_space_around_assignment_operator = insert
-cpp_space_pointer_reference_alignment = ignore
-cpp_space_around_ternary_operator = insert
-cpp_wrap_preserve_blocks = one_liners
diff --git a/Editor/SourceSansPro-Regular.ttf b/Editor/SourceSansPro-Regular.ttf
deleted file mode 100644
index 345bb426..00000000
Binary files a/Editor/SourceSansPro-Regular.ttf and /dev/null differ
diff --git a/Editor/test.html b/Editor/test.html
deleted file mode 100644
index 5812997e..00000000
--- a/Editor/test.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/EditorNet/src/Editor.cs b/EditorNet/src/Editor.cs
index a4cce58f..8b8e38c3 100644
--- a/EditorNet/src/Editor.cs
+++ b/EditorNet/src/Editor.cs
@@ -117,14 +117,14 @@ namespace Nuake
if (componentType == null)
{
- Nuake.Net.Engine.Log($"Component '{componentName}' not found in the Nuake.Net assembly.");
+ //Nuake.Net.Engine.Log($"Component '{componentName}' not found in the Nuake.Net assembly.");
}
// Find the field within the component class
PropertyInfo = componentType.GetProperty(fieldName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase);
if (PropertyInfo == null)
{
- Nuake.Net.Engine.Log(($"Field '{fieldName}' not found in component '{componentName}'."));
+ //Nuake.Net.Engine.Log(($"Field '{fieldName}' not found in component '{componentName}'."));
}
// Assume we have an instance of the component (you would need to pass the correct instance here)
@@ -136,12 +136,12 @@ namespace Nuake
PropertyOldValue = PropertyInfo.GetValue(Instance);
PropertyValue = convertedValue;
- Nuake.Net.Engine.Log($"Set '{fieldName}' of '{componentName}' to '{value}' in Nuake.Net.");
+ //Nuake.Net.Engine.Log($"Set '{fieldName}' of '{componentName}' to '{value}' in Nuake.Net.");
}
public virtual void Do()
{
- Nuake.Net.Engine.Log($"'{PropertyValue}' in Nuake.Net.");
+ //Nuake.Net.Engine.Log($"'{PropertyValue}' in Nuake.Net.");
PropertyInfo.SetValue(Instance, PropertyValue);
}
@@ -155,7 +155,7 @@ namespace Nuake
{
PropertyInfo.SetValue(Instance, PropertyOldValue);
- Nuake.Net.Engine.Log($"'{PropertyOldValue}' in Nuake.Net.");
+ //Nuake.Net.Engine.Log($"'{PropertyOldValue}' in Nuake.Net.");
return true;
}
@@ -194,14 +194,14 @@ namespace Nuake
if (componentType == null)
{
- Nuake.Net.Engine.Log($"Component '{componentName}' not found in the Nuake.Net assembly.");
+ //Nuake.Net.Engine.Log($"Component '{componentName}' not found in the Nuake.Net assembly.");
}
// Find the field within the component class
PropertyInfo = componentType.GetProperty(fieldName, BindingFlags.Static | BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase);
if (PropertyInfo == null)
{
- Nuake.Net.Engine.Log(($"Static Field '{fieldName}' not found in component '{componentName}'."));
+ //Nuake.Net.Engine.Log(($"Static Field '{fieldName}' not found in component '{componentName}'."));
}
// Convert the value to the correct type and set the property
@@ -210,14 +210,14 @@ namespace Nuake
PropertyOldValue = PropertyInfo.GetValue(null);
PropertyValue = convertedValue;
- Nuake.Net.Engine.Log($"Set '{fieldName}' of '{componentName}' to '{value}' in Nuake.Net.");
+ //Nuake.Net.Engine.Log($"Set '{fieldName}' of '{componentName}' to '{value}' in Nuake.Net.");
}
public virtual void Do()
{
PropertyInfo.SetValue(null, PropertyValue);
- Nuake.Net.Engine.Log($"'{PropertyValue}' in Nuake.Net.");
+ //Nuake.Net.Engine.Log($"'{PropertyValue}' in Nuake.Net.");
}
public string GetName()
@@ -229,7 +229,7 @@ namespace Nuake
{
PropertyInfo.SetValue(null, PropertyOldValue);
- Nuake.Net.Engine.Log($"'{PropertyOldValue}' in Nuake.Net.");
+ //Nuake.Net.Engine.Log($"'{PropertyOldValue}' in Nuake.Net.");
return true;
}
diff --git a/Nuake/NuakePCH.cpp b/Nuake/NuakePCH.cpp
deleted file mode 100644
index f60538d7..00000000
--- a/Nuake/NuakePCH.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "NuakePCH.h"
\ No newline at end of file
diff --git a/Nuake/Engine.cpp b/Nuake/Source/Engine.cpp
similarity index 93%
rename from Nuake/Engine.cpp
rename to Nuake/Source/Engine.cpp
index 9181ccca..aa4949d1 100644
--- a/Nuake/Engine.cpp
+++ b/Nuake/Source/Engine.cpp
@@ -1,20 +1,20 @@
#include "Engine.h"
-#include "src/Scene/Scene.h"
-#include "src/Resource/Project.h"
-#include "src/Physics/PhysicsManager.h"
+#include "Nuake/Scene/Scene.h"
+#include "Nuake/Resource/Project.h"
+#include "Nuake/Physics/PhysicsManager.h"
-#include "src/AI/NavManager.h"
-#include "src/Audio/AudioManager.h"
-#include "src/FileSystem/FileSystem.h"
-#include "src/Core/Input.h"
-#include "src/Rendering/Renderer.h"
-#include "src/Rendering/Renderer2D.h"
-#include "src/Scripting/ScriptingEngineNet.h"
-#include "src/Threading/JobSystem.h"
-#include "src/Core/RegisterCoreTypes.h"
-#include "src/Modules/Modules.h"
-#include "src/Subsystems/EngineSubsystemScriptable.h"
+#include "Nuake/AI/NavManager.h"
+#include "Nuake/Audio/AudioManager.h"
+#include "Nuake/FileSystem/FileSystem.h"
+#include "Nuake/Core/Input.h"
+#include "Nuake/Rendering/Renderer.h"
+#include "Nuake/Rendering/Renderer2D.h"
+#include "Nuake/Scripting/ScriptingEngineNet.h"
+#include "Nuake/Threading/JobSystem.h"
+#include "Nuake/Core/RegisterCoreTypes.h"
+#include "Nuake/Modules/Modules.h"
+#include "Nuake/Subsystems/EngineSubsystemScriptable.h"
#include
#include
@@ -24,11 +24,11 @@
#include
#ifdef NK_VK
- #include "src/Rendering/Vulkan/VulkanRenderer.h"
+ #include "Nuake/Rendering/Vulkan/VulkanRenderer.h"
#endif
#include
-#include
+#include "Nuake/Resource/Resolvers/MeshResolver.h"
namespace Nuake
diff --git a/Nuake/Engine.h b/Nuake/Source/Engine.h
similarity index 95%
rename from Nuake/Engine.h
rename to Nuake/Source/Engine.h
index 1d5a78a8..92d66012 100644
--- a/Nuake/Engine.h
+++ b/Nuake/Source/Engine.h
@@ -1,9 +1,9 @@
#pragma once
-#include "src/Core/Core.h"
-#include "src/Core/Logger.h"
-#include "src/Window.h"
-#include "src/Core/MulticastDelegate.h"
+#include "Nuake/Core/Core.h"
+#include "Nuake/Core/Logger.h"
+#include "Nuake/Window.h"
+#include "Nuake/Core/MulticastDelegate.h"
// Welcome to the Nuake source code.
namespace Nuake
diff --git a/Nuake/src/AI/NavManager.cpp b/Nuake/Source/Nuake/AI/NavManager.cpp
similarity index 98%
rename from Nuake/src/AI/NavManager.cpp
rename to Nuake/Source/Nuake/AI/NavManager.cpp
index 4421c256..5abcaad7 100644
--- a/Nuake/src/AI/NavManager.cpp
+++ b/Nuake/Source/Nuake/AI/NavManager.cpp
@@ -1,6 +1,6 @@
#include "NavManager.h"
-#include "src/Core/Logger.h"
-#include "src/Rendering/Vertex.h"
+#include "Nuake/Core/Logger.h"
+#include "Nuake/Rendering/Vertex.h"
#include "Recast.h"
#include
#include
@@ -9,10 +9,10 @@
#include
#include "Engine.h"
-#include "src/Scene/Entities/Entity.h"
-#include "src/Core/Maths.h"
+#include "Nuake/Scene/Entities/Entity.h"
+#include "Nuake/Core/Maths.h"
-#include "src/AI/RecastConfig.h"
+#include "Nuake/AI/RecastConfig.h"
#include "NavMesh.h"
namespace Nuake {
diff --git a/Nuake/src/AI/NavManager.h b/Nuake/Source/Nuake/AI/NavManager.h
similarity index 88%
rename from Nuake/src/AI/NavManager.h
rename to Nuake/Source/Nuake/AI/NavManager.h
index d6bd1ac3..2689475c 100644
--- a/Nuake/src/AI/NavManager.h
+++ b/Nuake/Source/Nuake/AI/NavManager.h
@@ -1,7 +1,7 @@
#pragma once
-#include "src/Core/Core.h"
-#include "src/Rendering/Mesh/Mesh.h"
-#include "src/AI/NavMesh.h"
+#include "Nuake/Core/Core.h"
+#include "Nuake/Rendering/Mesh/Mesh.h"
+#include "Nuake/AI/NavMesh.h"
#include "NavMeshDebugDrawer.h"
diff --git a/Nuake/src/AI/NavMesh.cpp b/Nuake/Source/Nuake/AI/NavMesh.cpp
similarity index 98%
rename from Nuake/src/AI/NavMesh.cpp
rename to Nuake/Source/Nuake/AI/NavMesh.cpp
index 1eece31e..29cb7918 100644
--- a/Nuake/src/AI/NavMesh.cpp
+++ b/Nuake/Source/Nuake/AI/NavMesh.cpp
@@ -1,9 +1,9 @@
#include "NavMesh.h"
#include "Recast.h"
-#include "src/Core/String.h"
+#include "Nuake/Core/String.h"
#include
#include "DetourNavMeshQuery.h"
-#include
+#include "Nuake/Core/Logger.h"
namespace Nuake {
diff --git a/Nuake/src/AI/NavMesh.h b/Nuake/Source/Nuake/AI/NavMesh.h
similarity index 93%
rename from Nuake/src/AI/NavMesh.h
rename to Nuake/Source/Nuake/AI/NavMesh.h
index 6d2afbf0..eca994a9 100644
--- a/Nuake/src/AI/NavMesh.h
+++ b/Nuake/Source/Nuake/AI/NavMesh.h
@@ -1,6 +1,6 @@
#pragma once
-#include
-#include "src/Resource/Serializable.h"
+#include "Nuake/Core/Maths.h"
+#include "Nuake/Resource/Serializable.h"
#include
#include
diff --git a/Nuake/src/AI/NavMeshDebugDrawer.cpp b/Nuake/Source/Nuake/AI/NavMeshDebugDrawer.cpp
similarity index 100%
rename from Nuake/src/AI/NavMeshDebugDrawer.cpp
rename to Nuake/Source/Nuake/AI/NavMeshDebugDrawer.cpp
diff --git a/Nuake/src/AI/NavMeshDebugDrawer.h b/Nuake/Source/Nuake/AI/NavMeshDebugDrawer.h
similarity index 100%
rename from Nuake/src/AI/NavMeshDebugDrawer.h
rename to Nuake/Source/Nuake/AI/NavMeshDebugDrawer.h
diff --git a/Nuake/src/AI/RecastConfig.cpp b/Nuake/Source/Nuake/AI/RecastConfig.cpp
similarity index 93%
rename from Nuake/src/AI/RecastConfig.cpp
rename to Nuake/Source/Nuake/AI/RecastConfig.cpp
index f97f073f..e9c3a06e 100644
--- a/Nuake/src/AI/RecastConfig.cpp
+++ b/Nuake/Source/Nuake/AI/RecastConfig.cpp
@@ -1,5 +1,5 @@
#include "RecastConfig.h"
-#include "src/Scene/Components/NavMeshVolumeComponent.h"
+#include "Nuake/Scene/Components/NavMeshVolumeComponent.h"
namespace Nuake {
diff --git a/Nuake/src/AI/RecastConfig.h b/Nuake/Source/Nuake/AI/RecastConfig.h
similarity index 95%
rename from Nuake/src/AI/RecastConfig.h
rename to Nuake/Source/Nuake/AI/RecastConfig.h
index 9fceeae4..f780b4f2 100644
--- a/Nuake/src/AI/RecastConfig.h
+++ b/Nuake/Source/Nuake/AI/RecastConfig.h
@@ -1,5 +1,5 @@
#pragma once
-#include "src/Core/Maths.h"
+#include "Nuake/Core/Maths.h"
namespace Nuake {
diff --git a/Nuake/src/Application/Application.cpp b/Nuake/Source/Nuake/Application/Application.cpp
similarity index 100%
rename from Nuake/src/Application/Application.cpp
rename to Nuake/Source/Nuake/Application/Application.cpp
diff --git a/Nuake/src/Application/Application.h b/Nuake/Source/Nuake/Application/Application.h
similarity index 97%
rename from Nuake/src/Application/Application.h
rename to Nuake/Source/Nuake/Application/Application.h
index d166d458..e22f18cd 100644
--- a/Nuake/src/Application/Application.h
+++ b/Nuake/Source/Nuake/Application/Application.h
@@ -1,11 +1,11 @@
#pragma once
#include "IApplicationModule.h"
-#include "src/Core/Core.h"
+#include "Nuake/Core/Core.h"
#include "LayerStack.h"
#include
#include
-#include
+#include "Nuake/Window.h"
namespace Nuake {
diff --git a/Nuake/src/Application/EntryPoint.h b/Nuake/Source/Nuake/Application/EntryPoint.h
similarity index 100%
rename from Nuake/src/Application/EntryPoint.h
rename to Nuake/Source/Nuake/Application/EntryPoint.h
diff --git a/Nuake/src/Application/IApplicationModule.h b/Nuake/Source/Nuake/Application/IApplicationModule.h
similarity index 100%
rename from Nuake/src/Application/IApplicationModule.h
rename to Nuake/Source/Nuake/Application/IApplicationModule.h
diff --git a/Nuake/src/Application/Layer.h b/Nuake/Source/Nuake/Application/Layer.h
similarity index 96%
rename from Nuake/src/Application/Layer.h
rename to Nuake/Source/Nuake/Application/Layer.h
index 9aa6af93..cc4c8b41 100644
--- a/Nuake/src/Application/Layer.h
+++ b/Nuake/Source/Nuake/Application/Layer.h
@@ -1,5 +1,5 @@
#pragma once
-#include "src/Core/Core.h"
+#include "Nuake/Core/Core.h"
#include "Application.h"
diff --git a/Nuake/src/Application/LayerStack.cpp b/Nuake/Source/Nuake/Application/LayerStack.cpp
similarity index 100%
rename from Nuake/src/Application/LayerStack.cpp
rename to Nuake/Source/Nuake/Application/LayerStack.cpp
diff --git a/Nuake/src/Application/LayerStack.h b/Nuake/Source/Nuake/Application/LayerStack.h
similarity index 94%
rename from Nuake/src/Application/LayerStack.h
rename to Nuake/Source/Nuake/Application/LayerStack.h
index 0b8d525c..a6ae99e2 100644
--- a/Nuake/src/Application/LayerStack.h
+++ b/Nuake/Source/Nuake/Application/LayerStack.h
@@ -1,5 +1,5 @@
#pragma once
-#include "src/Core/Core.h"
+#include "Nuake/Core/Core.h"
#include
diff --git a/Nuake/src/Audio/AudioManager.cpp b/Nuake/Source/Nuake/Audio/AudioManager.cpp
similarity index 98%
rename from Nuake/src/Audio/AudioManager.cpp
rename to Nuake/Source/Nuake/Audio/AudioManager.cpp
index 95a0594f..2deb10ff 100644
--- a/Nuake/src/Audio/AudioManager.cpp
+++ b/Nuake/Source/Nuake/Audio/AudioManager.cpp
@@ -1,6 +1,6 @@
#include "AudioManager.h"
-#include "src/Core/Logger.h"
-#include "src/FileSystem/FileSystem.h"
+#include "Nuake/Core/Logger.h"
+#include "Nuake/FileSystem/FileSystem.h"
#include
#include "soloud_speech.h"
diff --git a/Nuake/src/Audio/AudioManager.h b/Nuake/Source/Nuake/Audio/AudioManager.h
similarity index 97%
rename from Nuake/src/Audio/AudioManager.h
rename to Nuake/Source/Nuake/Audio/AudioManager.h
index 706d7683..2ae5d52f 100644
--- a/Nuake/src/Audio/AudioManager.h
+++ b/Nuake/Source/Nuake/Audio/AudioManager.h
@@ -1,6 +1,6 @@
#pragma once
-#include "src/Core/Core.h"
-#include
+#include "Nuake/Core/Core.h"
+#include "Nuake/Core/Maths.h"
#include
#include
diff --git a/Nuake/src/Audio/AudioSource.h b/Nuake/Source/Nuake/Audio/AudioSource.h
similarity index 100%
rename from Nuake/src/Audio/AudioSource.h
rename to Nuake/Source/Nuake/Audio/AudioSource.h
diff --git a/Nuake/src/Core/Core.h b/Nuake/Source/Nuake/Core/Core.h
similarity index 100%
rename from Nuake/src/Core/Core.h
rename to Nuake/Source/Nuake/Core/Core.h
diff --git a/Nuake/src/Core/Event.h b/Nuake/Source/Nuake/Core/Event.h
similarity index 100%
rename from Nuake/src/Core/Event.h
rename to Nuake/Source/Nuake/Core/Event.h
diff --git a/Nuake/src/Core/Input.cpp b/Nuake/Source/Nuake/Core/Input.cpp
similarity index 99%
rename from Nuake/src/Core/Input.cpp
rename to Nuake/Source/Nuake/Core/Input.cpp
index 54d7187a..a0a98bda 100644
--- a/Nuake/src/Core/Input.cpp
+++ b/Nuake/Source/Nuake/Core/Input.cpp
@@ -1,5 +1,5 @@
#include "Input.h"
-#include "src/Window.h"
+#include "Nuake/Window.h"
#include
#include
diff --git a/Nuake/src/Core/Input.h b/Nuake/Source/Nuake/Core/Input.h
similarity index 99%
rename from Nuake/src/Core/Input.h
rename to Nuake/Source/Nuake/Core/Input.h
index d683bf93..8a0c1486 100644
--- a/Nuake/src/Core/Input.h
+++ b/Nuake/Source/Nuake/Core/Input.h
@@ -1,5 +1,5 @@
#pragma once
-#include "src/Core/Maths.h"
+#include "Nuake/Core/Maths.h"
#include
#include