*misc

4 files changed, 155 insertions, 96 deletions

diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj
index 6418165..1ae6d0d 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj
@@ -146,12 +146,21 @@
     <ClCompile Include="..\..\..\Editor\EditorManager.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\ContainnerWindow.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp" />
+    <ClCompile Include="..\..\..\Editor\GUI\MainWindow.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\WindowManager.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\GUIWindow.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\MenuManager.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\SplitWindow.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\WindowUtil.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp" />
+    <ClCompile Include="..\..\..\Editor\IMGUI\GUIButton.cpp" />
+    <ClCompile Include="..\..\..\Editor\Resource\ResourceManager.cpp" />
+    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\ContainerWindow.bind.cpp" />
+    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\EditorGUI.bind.cpp" />
+    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\GUIWindow.bind.cpp" />
+    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\SplitWindow.bind.cpp" />
+    <ClCompile Include="..\..\..\Editor\Scripting\EditorScripting.cpp" />
+    <ClCompile Include="..\..\..\Editor\Scripting\IMGUI\GUIButton.bind.cpp" />
     <ClCompile Include="..\..\..\Editor\Utils\HelperFuncs.cpp" />
     <ClCompile Include="..\..\..\Editor\Utils\Log.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp" />
@@ -175,6 +184,8 @@
     <ClInclude Include="..\..\..\Editor\GUI\MenuManager.h" />
     <ClInclude Include="..\..\..\Editor\GUI\Rect.h" />
     <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h" />
+    <ClInclude Include="..\..\..\Editor\Resource\ResourceManager.h" />
+    <ClInclude Include="..\..\..\Editor\Scripting\EditorScripting.h" />
     <ClInclude Include="..\..\..\Editor\Utils\HelperFuncs.h" />
     <ClInclude Include="..\..\..\Editor\Utils\Log.h" />
     <ClInclude Include="..\..\..\Runtime\Math\AABB.h" />
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
index de41fde..5c0cfb5 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
@@ -31,6 +31,21 @@
     <Filter Include="Editor\Scripting">
       <UniqueIdentifier>{bfc8b148-db9d-403d-96b9-32c946e15402}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Editor\Resource">
+      <UniqueIdentifier>{5b8dba28-42d0-450a-98e1-ca4a65a4fc76}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Editor\Scripting\EditorGUI">
+      <UniqueIdentifier>{848489fc-f661-4b10-91f5-db1687293b95}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Editor\Scripting\EditorGUILayout">
+      <UniqueIdentifier>{87edd159-c171-4ccb-9094-9e5061c980d0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Editor\Scripting\Resource">
+      <UniqueIdentifier>{476cedf1-fc4a-48a5-8782-bed16dabb86e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Editor\Scripting\IMGUI">
+      <UniqueIdentifier>{337f607e-8c00-4e7b-a925-9380e08a30f0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp">
@@ -108,6 +123,33 @@
     <ClCompile Include="..\..\..\Editor\Utils\HelperFuncs.cpp">
       <Filter>Editor\Utils</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Editor\GUI\MainWindow.cpp">
+      <Filter>Editor\GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Resource\ResourceManager.cpp">
+      <Filter>Editor\Resource</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\EditorGUI.bind.cpp">
+      <Filter>Editor\Scripting\EditorGUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Scripting\EditorScripting.cpp">
+      <Filter>Editor\Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\ContainerWindow.bind.cpp">
+      <Filter>Editor\Scripting\EditorGUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\GUIWindow.bind.cpp">
+      <Filter>Editor\Scripting\EditorGUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\SplitWindow.bind.cpp">
+      <Filter>Editor\Scripting\EditorGUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\IMGUI\GUIButton.cpp">
+      <Filter>Editor\IMGUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Scripting\IMGUI\GUIButton.bind.cpp">
+      <Filter>Editor\Scripting\IMGUI</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Editor\GUI\Dock.h">
@@ -218,6 +260,12 @@
     <ClInclude Include="..\..\..\Editor\GUI\MenuManager.h">
       <Filter>Editor\GUI</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Editor\Resource\ResourceManager.h">
+      <Filter>Editor\Resource</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Editor\Scripting\EditorScripting.h">
+      <Filter>Editor\Scripting</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc">
diff --git a/Projects/VisualStudio/Runtime/Runtime.vcxproj b/Projects/VisualStudio/Runtime/Runtime.vcxproj
index c0179de..5ce1d52 100644
--- a/Projects/VisualStudio/Runtime/Runtime.vcxproj
+++ b/Projects/VisualStudio/Runtime/Runtime.vcxproj
@@ -50,20 +50,20 @@
     <ClInclude Include="..\..\..\Runtime\Physics\Rigidbody.h" />
     <ClInclude Include="..\..\..\Runtime\Profiler\FrameStats.h" />
     <ClInclude Include="..\..\..\Runtime\Profiler\Profiler.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_cfunctions.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_class.hpp" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_config.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_enum.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_globalstate.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_internal.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_memberref.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_ref.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_reftable.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_state.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_utility.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_vm.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_watchdog.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBind.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindClass.hpp" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindConfig.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindEnum.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindGlobalState.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindInternal.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRef.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRefTable.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindState.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindUtility.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindVM.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.h" />
     <ClInclude Include="..\..\..\Runtime\Shaders\ShaderChannel.h" />
     <ClInclude Include="..\..\..\Runtime\Shaders\ShaderDefine.h" />
     <ClInclude Include="..\..\..\Runtime\Shaders\ShaderUniform.h" />
@@ -107,15 +107,15 @@
     <ClCompile Include="..\..\..\Runtime\Mesh\Font.cpp" />
     <ClCompile Include="..\..\..\Runtime\Mesh\Mesh.cpp" />
     <ClCompile Include="..\..\..\Runtime\Physics\Scripting\wrap_Joint.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_cfunctions.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_class.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_enum.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_memberref.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_ref.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_reftable.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_state.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_vm.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_watchdog.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindClass.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindEnum.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRef.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRefTable.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindState.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindVM.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.cpp" />
     <ClCompile Include="..\..\..\Runtime\Shaders\ShaderDefine.cpp" />
     <ClCompile Include="..\..\..\Runtime\Threads\Mutex.cpp" />
     <ClCompile Include="..\..\..\Runtime\Threads\Semaphore.cpp" />
@@ -134,8 +134,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\Runtime\Scripting\luax_class.inc" />
-    <None Include="..\..\..\Runtime\Scripting\luax_state.inc" />
+    <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc" />
+    <None Include="..\..\..\Runtime\Scripting\LuaBindState.inc" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
diff --git a/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters b/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters
index 018dac5..8de44e2 100644
--- a/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters
+++ b/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters
@@ -135,48 +135,6 @@
     <ClInclude Include="..\..\..\Runtime\Graphics\PolyLine.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_cfunctions.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_class.hpp">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_config.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_enum.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_globalstate.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_internal.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_memberref.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_ref.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_reftable.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_state.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_utility.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_vm.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\luax_watchdog.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Runtime\FileSystem\Unzip.h">
       <Filter>FileSystem</Filter>
     </ClInclude>
@@ -231,6 +189,48 @@
     <ClInclude Include="..\..\..\Runtime\ImGUI\GUILabel.h">
       <Filter>ImGUI</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBind.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindClass.hpp">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindConfig.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindEnum.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindGlobalState.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindInternal.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRef.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRefTable.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindState.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindUtility.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindVM.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Runtime\Mesh\Mesh.cpp">
@@ -297,33 +297,6 @@
     <ClCompile Include="..\..\..\Runtime\Graphics\PolyLine.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_cfunctions.cpp">
-      <Filter>Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_class.cpp">
-      <Filter>Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_enum.cpp">
-      <Filter>Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_memberref.cpp">
-      <Filter>Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_ref.cpp">
-      <Filter>Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_reftable.cpp">
-      <Filter>Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_state.cpp">
-      <Filter>Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_vm.cpp">
-      <Filter>Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\luax_watchdog.cpp">
-      <Filter>Scripting</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Runtime\FileSystem\Unzip.cpp">
       <Filter>FileSystem</Filter>
     </ClCompile>
@@ -351,12 +324,39 @@
     <ClCompile Include="..\..\..\Runtime\ImGUI\GUILabel.cpp">
       <Filter>ImGUI</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindClass.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindEnum.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRef.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRefTable.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindState.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindVM.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\Runtime\Scripting\luax_class.inc">
+    <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc">
       <Filter>Scripting</Filter>
     </None>
-    <None Include="..\..\..\Runtime\Scripting\luax_state.inc">
+    <None Include="..\..\..\Runtime\Scripting\LuaBindState.inc">
       <Filter>Scripting</Filter>
     </None>
   </ItemGroup>