diff options
| author | chai <chaifix@163.com> | 2021-10-18 19:56:41 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2021-10-18 19:56:41 +0800 |
| commit | 45328cbadd8a946c19a77301f218efbf650e2f28 (patch) | |
| tree | 8ec4f3a9737b2cbb9744f8347a56783743be2a4c | |
| parent | b5702ece4c2cf751c252e76fb885a7ec41ccabe8 (diff) | |
*misc
| -rw-r--r-- | Documents/图片/1599987193.png | bin | 0 -> 3913 bytes | |||
| -rw-r--r-- | Documents/图片/1599987443.png | bin | 0 -> 6425 bytes | |||
| -rw-r--r-- | Documents/图片/1600091210.png | bin | 0 -> 2627 bytes | |||
| -rw-r--r-- | Documents/图片/1600136270.png | bin | 0 -> 2223 bytes | |||
| -rw-r--r-- | Documents/图片/gamelab_full_logo_small-2.png | bin | 0 -> 2604 bytes | |||
| -rw-r--r-- | Documents/图片/gamelab_full_logo_small.png | bin | 0 -> 3060 bytes | |||
| -rw-r--r-- | Documents/设计.xlsx | bin | 0 -> 9144 bytes | |||
| -rw-r--r-- | Editor/EditorApplication.cpp | 41 | ||||
| -rw-r--r-- | Editor/EditorApplication.h | 31 | ||||
| -rw-r--r-- | Editor/EditorMain.cpp | 48 | ||||
| -rw-r--r-- | Editor/GUI/ContainnerWindow.cpp | 11 | ||||
| -rw-r--r-- | Editor/GUI/EditorWindows.h | 24 | ||||
| -rw-r--r-- | Editor/GUI/GUIWindow.cpp | 14 | ||||
| -rw-r--r-- | Editor/GUI/WindowUtil.cpp | 2 | ||||
| -rw-r--r-- | Editor/Graphics/Graphics.cpp | 3 | ||||
| -rw-r--r-- | Editor/Graphics/Graphics.h | 3 | ||||
| -rw-r--r-- | Editor/Scripting/Editor/Editor.bind.cpp | 17 | ||||
| -rw-r--r-- | Editor/Scripting/Editor/EditorApplication.bind.cpp | 47 | ||||
| -rw-r--r-- | Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp | 50 | ||||
| -rw-r--r-- | Editor/Scripting/EditorGUI/EditorGUI.bind.cpp | 3 | ||||
| -rw-r--r-- | Editor/Scripting/EditorGUI/GUIWindow.bind.cpp | 63 | ||||
| -rw-r--r-- | Editor/Scripting/EditorScripting.cpp | 4 | ||||
| -rw-r--r-- | Editor/Scripting/EditorScripting.h | 2 | ||||
| -rw-r--r-- | Projects/VisualStudio/Editor/Editor.vcxproj | 490 | ||||
| -rw-r--r-- | Projects/VisualStudio/Editor/Editor.vcxproj.filters | 665 | ||||
| -rw-r--r-- | Projects/VisualStudio/Editor/Editor.vcxproj.user | 15 | ||||
| -rw-r--r-- | Resources/Scripts/Editor/ProjectWindow.lua | 18 | ||||
| -rw-r--r-- | Resources/Scripts/EditorApplication.lua | 26 | ||||
| -rw-r--r-- | Resources/Scripts/Utils/Utils.lua | 4 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBind.h (renamed from Runtime/LuaBind/LuaBind.h) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindCFunctions.cpp (renamed from Runtime/LuaBind/LuaBindCFunctions.cpp) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindCFunctions.h (renamed from Runtime/LuaBind/LuaBindCFunctions.h) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindClass.cpp (renamed from Runtime/LuaBind/LuaBindClass.cpp) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindClass.hpp (renamed from Runtime/LuaBind/LuaBindClass.hpp) | 3 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindClass.inc (renamed from Runtime/LuaBind/LuaBindClass.inc) | 53 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindConfig.h (renamed from Runtime/LuaBind/LuaBindConfig.h) | 7 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindEnum.cpp (renamed from Runtime/LuaBind/LuaBindEnum.cpp) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindEnum.h (renamed from Runtime/LuaBind/LuaBindEnum.h) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindGlobalState.h (renamed from Runtime/LuaBind/LuaBindGlobalState.h) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindInternal.h (renamed from Runtime/LuaBind/LuaBindInternal.h) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindMemberRef.cpp (renamed from Runtime/LuaBind/LuaBindMemberRef.cpp) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindMemberRef.h (renamed from Runtime/LuaBind/LuaBindMemberRef.h) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindRef.cpp (renamed from Runtime/LuaBind/LuaBindRef.cpp) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindRef.h (renamed from Runtime/LuaBind/LuaBindRef.h) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindRefTable.cpp (renamed from Runtime/LuaBind/LuaBindRefTable.cpp) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindRefTable.h (renamed from Runtime/LuaBind/LuaBindRefTable.h) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindState.cpp (renamed from Runtime/LuaBind/LuaBindState.cpp) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindState.h (renamed from Runtime/LuaBind/LuaBindState.h) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindState.inc (renamed from Runtime/LuaBind/LuaBindState.inc) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindUtility.h (renamed from Runtime/LuaBind/LuaBindUtility.h) | 3 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindVM.cpp (renamed from Runtime/LuaBind/LuaBindVM.cpp) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindVM.h (renamed from Runtime/LuaBind/LuaBindVM.h) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindWatchDog.cpp (renamed from Runtime/LuaBind/LuaBindWatchDog.cpp) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindWatchDog.h (renamed from Runtime/LuaBind/LuaBindWatchDog.h) | 0 | ||||
| -rw-r--r-- | Runtime/Lua/LuaHelper.cpp | 23 | ||||
| -rw-r--r-- | Runtime/Lua/LuaHelper.h | 10 | ||||
| -rw-r--r-- | Runtime/Scripting/GL/GL.bind.cpp | 2 |
57 files changed, 1007 insertions, 675 deletions
diff --git a/Documents/图片/1599987193.png b/Documents/图片/1599987193.png Binary files differnew file mode 100644 index 0000000..cf03096 --- /dev/null +++ b/Documents/图片/1599987193.png diff --git a/Documents/图片/1599987443.png b/Documents/图片/1599987443.png Binary files differnew file mode 100644 index 0000000..0124a7a --- /dev/null +++ b/Documents/图片/1599987443.png diff --git a/Documents/图片/1600091210.png b/Documents/图片/1600091210.png Binary files differnew file mode 100644 index 0000000..7413af7 --- /dev/null +++ b/Documents/图片/1600091210.png diff --git a/Documents/图片/1600136270.png b/Documents/图片/1600136270.png Binary files differnew file mode 100644 index 0000000..32be590 --- /dev/null +++ b/Documents/图片/1600136270.png diff --git a/Documents/图片/gamelab_full_logo_small-2.png b/Documents/图片/gamelab_full_logo_small-2.png Binary files differnew file mode 100644 index 0000000..e93e741 --- /dev/null +++ b/Documents/图片/gamelab_full_logo_small-2.png diff --git a/Documents/图片/gamelab_full_logo_small.png b/Documents/图片/gamelab_full_logo_small.png Binary files differnew file mode 100644 index 0000000..adc1374 --- /dev/null +++ b/Documents/图片/gamelab_full_logo_small.png diff --git a/Documents/设计.xlsx b/Documents/设计.xlsx Binary files differnew file mode 100644 index 0000000..db598ba --- /dev/null +++ b/Documents/设计.xlsx diff --git a/Editor/EditorApplication.cpp b/Editor/EditorApplication.cpp new file mode 100644 index 0000000..0ebff72 --- /dev/null +++ b/Editor/EditorApplication.cpp @@ -0,0 +1,41 @@ +#include "EditorApplication.h"
+#include "Runtime/Utilities/Assert.h"
+#include "Editor/EditorManager.h"
+
+static bool s_Created;
+
+EditorApplication::EditorApplication()
+{
+ Assert(!s_Created);
+}
+
+EditorApplication::~EditorApplication()
+{
+
+}
+
+void EditorApplication::SetMainWindow(ContainnerWindow* wnd)
+{
+ Assert(wnd);
+ EditorManager::Instance()->SetMainWindow(wnd);
+}
+
+void EditorApplication::PullMessage()
+{
+ MSG msg; + while (PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE) != 0) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + + if (msg.message == WM_QUIT) + { + OnQuit(); + } + } +}
+
+void EditorApplication::OnQuit()
+{
+
+}
\ No newline at end of file diff --git a/Editor/EditorApplication.h b/Editor/EditorApplication.h new file mode 100644 index 0000000..eb08c46 --- /dev/null +++ b/Editor/EditorApplication.h @@ -0,0 +1,31 @@ +#include <string>
+#include <windows.h>
+#include "Runtime/Lua/LuaBind/LuaBind.h"
+#include "Editor/GUI/EditorWindows.h"
+#include "Editor/GUI/MenuManager.h"
+
+using namespace LuaBind;
+
+class EditorApplication
+ : public LuaBind::NativeClass<EditorApplication > +{
+public:
+ EditorApplication();
+ ~EditorApplication();
+
+ void PullMessage();
+ void SetMainWindow(ContainnerWindow* wnd);
+
+ void OnQuit();
+
+private :
+
+ LUA_BIND_DECL_FACTORY(EditorApplication); +
+ LUA_BIND_DECL_METHOD(_New);
+ LUA_BIND_DECL_METHOD(_SetMainWindow);
+ LUA_BIND_DECL_METHOD(_SetupMenu);
+ LUA_BIND_DECL_METHOD(_PullMessage);
+
+
+};
diff --git a/Editor/EditorMain.cpp b/Editor/EditorMain.cpp index 1606e94..67ddc38 100644 --- a/Editor/EditorMain.cpp +++ b/Editor/EditorMain.cpp @@ -1,7 +1,7 @@ #include <windows.h>
#include <vector>
#include "GUI/EditorWindows.h"
-#include "Runtime/LuaBind/LuaBind.h"
+#include "Runtime/Lua/LuaBind/LuaBind.h"
#include "EditorManager.h"
#include "Runtime/Graphics/OpenGL.h"
#include "Editor/Scripting/EditorScripting.h"
@@ -54,51 +54,9 @@ int main() int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) #endif {
- InitLuaState();
-
- WindowUtil::Init();
-
- ContainnerWindow* wnd = new ContainnerWindow();
- Vector2f min = Vector2f(100, 100);
- Vector2f max = Vector2f(700, 700);
- wnd->Init(Rectf(400, 400, 800, 500), ContainnerWindow::kShowMainWindow, min, max);
- wnd->SetTitle("GameLab");
- wnd->SetIcon("./Icon/GameLab.ico");
-
- EditorManager::Instance()->SetMainWindow(wnd);
- MenuManager::Instance()->Init();
-
- GUIWindow* guiWnd = new GUIWindow();
- guiWnd->Init();
- guiWnd->SetContainnerWindow(wnd);
- Rectf position;
- position.x = 0;
- position.y = 0;
- position.width = 200;
- position.height = 200;
- guiWnd->SetPosition(position);
+ WindowUtil::RegisterClasses();
- GUIWindow* guiWnd2 = new GUIWindow();
- guiWnd2->Init();
- guiWnd2->SetContainnerWindow(wnd);
- position.x = 200;
- position.y = 0;
- position.width = 200;
- position.height = 200;
- guiWnd2->SetPosition(position);
-
- // init gl
- wglMakeCurrent(guiWnd2->GetDC(), guiWnd2->GetRC());
- if (!gladLoadGL()) {
- log_error("³õʼ»¯GL´íÎó");
- }
-
- // force repaint
- wnd->DoPaint();
- guiWnd->DoPaint();
- guiWnd2->DoPaint();
-
- MainLoop();
+ InitLuaState();
return 0;
}
\ No newline at end of file diff --git a/Editor/GUI/ContainnerWindow.cpp b/Editor/GUI/ContainnerWindow.cpp index 3778485..d6a67c9 100644 --- a/Editor/GUI/ContainnerWindow.cpp +++ b/Editor/GUI/ContainnerWindow.cpp @@ -5,6 +5,7 @@ #include "Editor/Utils/HelperFuncs.h" #include "MenuManager.h" #include "Runtime/Utilities/Assert.h" +#include "Editor/Graphics/Graphics.h" using namespace std; @@ -260,6 +261,15 @@ bool ContainnerWindow::SetRenderContext() return FALSE; // Return FALSE } + if (m_RC && !g_IsGLInitialized) + { + log_info("Initialize OpenGL"); + wglMakeCurrent(m_DC, m_RC);
+ if (!gladLoadGL()) {
+ log_error("³õʼ»¯GL´íÎó");
+ }
+ g_IsGLInitialized = true; + } } // ³õʼ»¯£¬´´½¨´°¿Ú @@ -388,6 +398,7 @@ void ContainnerWindow::Init(Rectf pixelRect, int showMode, const Vector2f& minSi //ShowInTaskbarIfNoMainWindow(m_Window); SetRenderContext(); + } void ContainnerWindow::SetTitle(const char* title) diff --git a/Editor/GUI/EditorWindows.h b/Editor/GUI/EditorWindows.h index 307ab86..97175b3 100644 --- a/Editor/GUI/EditorWindows.h +++ b/Editor/GUI/EditorWindows.h @@ -4,7 +4,8 @@ #include <windows.h> #include <vector> #include "Runtime/Math/Rect.h" -#include "Runtime/LuaBind/LuaBind.h" +#include "Runtime/Lua/LuaBind/LuaBind.h" +#include "Runtime/Lua/LuaHelper.h" #include "Runtime/Utilities/Singleton.h" #include "Runtime/Debug/Log.h" #include "Runtime/Graphics/OpenGL.h" @@ -18,7 +19,7 @@ class GUIWindow; class WindowUtil { public : - static void Init(); + static void RegisterClasses(); static const wchar_t* kContainerWindowClassName; static const wchar_t* kPopupWindowClassName; @@ -89,8 +90,11 @@ private: POINT m_MaxSize; LUA_BIND_DECL_FACTORY(ContainnerWindow); - LUA_BIND_DECL_METHOD(_SetTitle); - LUA_BIND_DECL_METHOD(_DoPaint); + + LUA_BIND_DECL_METHOD(_New); + LUA_BIND_DECL_METHOD(_SetTitle); + LUA_BIND_DECL_METHOD(_SetIcon); + LUA_BIND_DECL_METHOD(_DoPaint); }; @@ -122,7 +126,9 @@ private: }; // GUI´°¿Ú£¬Ê¼þÏàÓ¦¡¢»æÖÆ¡¢²¼¾ÖµÄµ¥Ôª -class GUIWindow : public WindowBase +class GUIWindow + : public WindowBase + , public LuaBind::NativeClass<GUIWindow> { public: static LRESULT CALLBACK GUIViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); @@ -155,6 +161,14 @@ private: LuaBind::Ref m_Script; + LUA_BIND_DECL_FACTORY(GUIWindow); + + LUA_BIND_DECL_METHOD(_New); + LUA_BIND_DECL_METHOD(_DoPaint); + LUA_BIND_DECL_METHOD(_Focus); + LUA_BIND_DECL_METHOD(_SetContainnerWindow); + LUA_BIND_DECL_METHOD(_SetPosition); + }; #endif
\ No newline at end of file diff --git a/Editor/GUI/GUIWindow.cpp b/Editor/GUI/GUIWindow.cpp index 3df0370..34d7705 100644 --- a/Editor/GUI/GUIWindow.cpp +++ b/Editor/GUI/GUIWindow.cpp @@ -1,6 +1,7 @@ #include "EditorWindows.h" #include "WinUtils.h" #include "Runtime/Graphics/OpenGL.h" +#include "Editor/Graphics/Graphics.h" static bool RedirectMouseWheel(HWND window, WPARAM wParam, LPARAM lParam) { @@ -223,10 +224,12 @@ void GUIWindow::Init(std::string name) ShowWindow(m_Handle, SW_SHOW); - if (!SetRenderContext()) + bool bRC = SetRenderContext(); + if (!bRC) log_error("Failed to setup rendering context"); log_info("Created GUIWindow " /*+ (long)this*/); + } bool GUIWindow::SetRenderContext() @@ -288,6 +291,15 @@ bool GUIWindow::SetRenderContext() return FALSE; // Return FALSE } + if (m_RC && !g_IsGLInitialized) + { + log_info("Initialize OpenGL"); + wglMakeCurrent(m_DC, m_RC);
+ if (!gladLoadGL()) {
+ log_error("³õʼ»¯GL´íÎó");
+ }
+ g_IsGLInitialized = true; + } return true; } diff --git a/Editor/GUI/WindowUtil.cpp b/Editor/GUI/WindowUtil.cpp index fc32719..b76b6d0 100644 --- a/Editor/GUI/WindowUtil.cpp +++ b/Editor/GUI/WindowUtil.cpp @@ -9,7 +9,7 @@ static ATOM ContainerWindowClassAtom; static ATOM PopupWindowClassAtom; static ATOM GUIViewClassAtom; -void WindowUtil::Init() +void WindowUtil::RegisterClasses() { log_info("WindowUtil::Init()"); diff --git a/Editor/Graphics/Graphics.cpp b/Editor/Graphics/Graphics.cpp new file mode 100644 index 0000000..af48d75 --- /dev/null +++ b/Editor/Graphics/Graphics.cpp @@ -0,0 +1,3 @@ +#include "Graphics.h"
+
+bool g_IsGLInitialized = false;
diff --git a/Editor/Graphics/Graphics.h b/Editor/Graphics/Graphics.h new file mode 100644 index 0000000..ad27ede --- /dev/null +++ b/Editor/Graphics/Graphics.h @@ -0,0 +1,3 @@ +#pragma once
+
+extern bool g_IsGLInitialized;
diff --git a/Editor/Scripting/Editor/Editor.bind.cpp b/Editor/Scripting/Editor/Editor.bind.cpp index e69de29..2300d2f 100644 --- a/Editor/Scripting/Editor/Editor.bind.cpp +++ b/Editor/Scripting/Editor/Editor.bind.cpp @@ -0,0 +1,17 @@ +#include "Editor/EditorApplication.h" + +// GameLab.Editor +int luaopen_GameLab_Editor(lua_State* L) +{ + log_info("Scripting", "luaopen_GameLab_Editor()"); + + LUA_BIND_STATE(L); + + state.PushGlobalNamespace(); + state.PushNamespace("GameLab"); + state.PushNamespace("Editor"); + + state.RegisterFactory<EditorApplication>(); + + return 1; +}
\ No newline at end of file diff --git a/Editor/Scripting/Editor/EditorApplication.bind.cpp b/Editor/Scripting/Editor/EditorApplication.bind.cpp index e69de29..82abdd5 100644 --- a/Editor/Scripting/Editor/EditorApplication.bind.cpp +++ b/Editor/Scripting/Editor/EditorApplication.bind.cpp @@ -0,0 +1,47 @@ +#include "Editor/EditorApplication.h"
+
+LUA_BIND_REGISTRY(EditorApplication) +{ + LUA_BIND_REGISTER_METHODS(state, + {"New", EditorApplication::_New}, + { "SetMainWindow", _SetMainWindow }, + { "SetupMenu", _SetupMenu }, + { "PullMessage", _PullMessage } + ); +} + +LUA_BIND_POSTPROCESS(EditorApplication) +{ +} + +LUA_BIND_IMPL_METHOD(EditorApplication, EditorApplication::_New) +{ + LUA_BIND_PREPARE(L, EditorApplication); + EditorApplication* app = new EditorApplication(); + app->PushUserdata(state); + return 1; +} + +LUA_BIND_IMPL_METHOD(EditorApplication, EditorApplication::_PullMessage) +{ + LUA_BIND_PREPARE(L, EditorApplication); + self->PullMessage(); + return 0; +} + +LUA_BIND_IMPL_METHOD(EditorApplication, _SetMainWindow) +{ + LUA_BIND_PREPARE(L, EditorApplication); + LUA_BIND_CHECK(L, "UU"); + + ContainnerWindow* wnd = state.GetUserdata<ContainnerWindow>(2); + self->SetMainWindow(wnd); + return 0; +} + +LUA_BIND_IMPL_METHOD(EditorApplication, _SetupMenu) +{ + LUA_BIND_PREPARE(L, EditorApplication); + MenuManager::Instance()->Init();
+ return 0; +}
\ No newline at end of file diff --git a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp b/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp index 265ea2e..d3d0997 100644 --- a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp +++ b/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp @@ -3,9 +3,11 @@ LUA_BIND_REGISTRY(ContainnerWindow) { LUA_BIND_REGISTER_METHODS(state, - { "SetTitle", _SetTitle }, - { "DoPaint", _DoPaint } - ); + { "SetTitle", _SetTitle }, + { "SetIcon", _SetIcon }, + { "DoPaint", _DoPaint }, + { "New", _New } + ); } LUA_BIND_POSTPROCESS(ContainnerWindow) @@ -22,16 +24,46 @@ LUA_BIND_POSTPROCESS(ContainnerWindow) LUA_BIND_IMPL_METHOD(ContainnerWindow, _SetTitle) { - LUA_BIND_PREPARE(L, ContainnerWindow); + LUA_BIND_PREPARE(L, ContainnerWindow); + + cc8* title = state.GetValue<cc8*>(2, ""); + self->SetTitle(title); + return 0; +} +LUA_BIND_IMPL_METHOD(ContainnerWindow, _SetIcon) +{ + LUA_BIND_PREPARE(L, ContainnerWindow); - return 0; + cc8* path = state.GetValue<cc8*>(2, ""); + self->SetIcon(path); + + return 0; } LUA_BIND_IMPL_METHOD(ContainnerWindow, _DoPaint) { - LUA_BIND_PREPARE(L, ContainnerWindow); - self->DoPaint(); - return 0; -}
\ No newline at end of file + LUA_BIND_PREPARE(L, ContainnerWindow); + self->DoPaint(); + return 0; +} + +LUA_BIND_IMPL_METHOD(ContainnerWindow, ContainnerWindow::_New) +{ + LUA_BIND_STATE(L, ContainnerWindow); + LUA_BIND_CHECK(L, "TNTT"); + + ContainnerWindow* wnd = new ContainnerWindow(); + + Rectf rect = state.GetValue<Rectf>(state, Rectf()); + int showMode = state.GetValue<int>(2, 0); + Vector2f min = state.GetValue<Vector2f>(state, Vector2f()); + Vector2f max = state.GetValue<Vector2f>(state, Vector2f()); + + wnd->Init(rect, showMode, min, max); + + wnd->PushUserdata(state); + + return 1; +} diff --git a/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp b/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp index 57c45ca..4e908c4 100644 --- a/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp +++ b/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp @@ -12,7 +12,8 @@ int luaopen_GameLab_Editor_GUI(lua_State* L) state.PushNamespace("Editor"); state.PushNamespace("GUI"); - state.RegisterFactory<ContainnerWindow>(); + state.RegisterFactory<ContainnerWindow>(); + state.RegisterFactory<GUIWindow>(); return 1; }
\ No newline at end of file diff --git a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp index e69de29..ec8f830 100644 --- a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp +++ b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp @@ -0,0 +1,63 @@ +#include "Editor/GUI/EditorWindows.h" + +LUA_BIND_REGISTRY(GUIWindow) +{ + LUA_BIND_REGISTER_METHODS(state, + { "DoPaint", _DoPaint }, + { "Focus", _Focus }, + { "SetContainnerWindow", _SetContainnerWindow }, + { "SetPosition", _SetPosition }, + { "New", _New } + ); +} + +LUA_BIND_POSTPROCESS(GUIWindow) +{ +} + +LUA_BIND_IMPL_METHOD(GUIWindow, _DoPaint) +{ + LUA_BIND_PREPARE(L, GUIWindow); + self->DoPaint(); + return 0; +} + +LUA_BIND_IMPL_METHOD(GUIWindow, _Focus) +{ + LUA_BIND_PREPARE(L, GUIWindow); + self->Focus(); + return 0; +} + +LUA_BIND_IMPL_METHOD(GUIWindow, _SetContainnerWindow) +{ + LUA_BIND_PREPARE(L, GUIWindow); + ContainnerWindow* wnd = state.GetUserdata<ContainnerWindow>(2); + self->SetContainnerWindow(wnd); + return 0; +} + +// GUIWindow.SetPosition(self, {x, y, width, height}) +LUA_BIND_IMPL_METHOD(GUIWindow, _SetPosition) +{ + LUA_BIND_PREPARE(L, GUIWindow); + if (!state.CheckParams(1, "UT")) + return 0; + + Rectf rect; + rect.x = state.GetField<float>(2, 1, 0); + rect.y = state.GetField<float>(2, 2, 0); + rect.width = state.GetField<float>(2, 3, 0); + rect.height = state.GetField<float>(2, 4, 0); + self->SetPosition(rect); + return 0; +} + +LUA_BIND_IMPL_METHOD(GUIWindow, _New) +{ + LUA_BIND_PREPARE(L, GUIWindow); + GUIWindow* wnd = new GUIWindow(); + wnd->PushUserdata(state); + wnd->Init(); + return 1; +}
\ No newline at end of file diff --git a/Editor/Scripting/EditorScripting.cpp b/Editor/Scripting/EditorScripting.cpp index 294d6f9..bb53848 100644 --- a/Editor/Scripting/EditorScripting.cpp +++ b/Editor/Scripting/EditorScripting.cpp @@ -32,7 +32,9 @@ bool SetupGameLabEditorScripting(lua_State* L) log_info("Scripting", "SetupGameLabEditorScripting()"); openlib(luaopen_GameLab_Debug); - openlib(luaopen_GameLab_Editor_GUI); + + openlib(luaopen_GameLab_Editor); + openlib(luaopen_GameLab_Editor_GUI); return true; } diff --git a/Editor/Scripting/EditorScripting.h b/Editor/Scripting/EditorScripting.h index 2ed2233..301ac3f 100644 --- a/Editor/Scripting/EditorScripting.h +++ b/Editor/Scripting/EditorScripting.h @@ -1,4 +1,4 @@ #pragma once -#include "Runtime/LuaBind/LuaBind.h" +#include "Runtime/Lua/LuaBind/LuaBind.h" bool SetupGameLabEditorScripting(lua_State* L); diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj index ce23a28..8dfc5c6 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj +++ b/Projects/VisualStudio/Editor/Editor.vcxproj @@ -1,243 +1,249 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <VCProjectVersion>15.0</VCProjectVersion> - <ProjectGuid>{CB47B19A-6649-4A1A-8FE5-6359178AA48F}</ProjectGuid> - <RootNamespace>Editor</RootNamespace> - <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)..\..\Build</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)..\..\Build</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)..\..\Build</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)..\..\Build</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;GAMELAB_DEBUG;GAMELAB_EDITOR;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(SolutionDir)..\..\ThirdParty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\Editor\EditorMain.cpp" /> - <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\Editor\Editor.bind.cpp" /> - <ClCompile Include="..\..\..\Editor\Scripting\Editor\EditorApplication.bind.cpp" /> - <ClCompile Include="..\..\..\Editor\Scripting\IMGUI\GUIButton.bind.cpp" /> - <ClCompile Include="..\..\..\Editor\Shaders\BuiltinShaders.cpp" /> - <ClCompile Include="..\..\..\Editor\Utils\HelperFuncs.cpp" /> - <ClCompile Include="..\..\..\Runtime\Debug\Log.cpp" /> - <ClCompile Include="..\..\..\Runtime\Graphics\OpenGL.cpp" /> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.cpp" /> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindClass.cpp" /> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindEnum.cpp" /> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.cpp" /> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRef.cpp" /> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.cpp" /> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindState.cpp" /> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindVM.cpp" /> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.cpp" /> - <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp" /> - <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp" /> - <ClCompile Include="..\..\..\Runtime\Scripting\Debug\Debug.bind.cpp" /> - <ClCompile Include="..\..\..\Runtime\Scripting\GL\GL.bind.cpp" /> - <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp" /> - <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\Editor\EditorManager.h" /> - <ClInclude Include="..\..\..\Editor\GUI\Dock.h" /> - <ClInclude Include="..\..\..\Editor\GUI\EditorWindows.h" /> - <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\Shaders\BuiltinShaders.h" /> - <ClInclude Include="..\..\..\Editor\Utils\HelperFuncs.h" /> - <ClInclude Include="..\..\..\Runtime\Debug\Log.h" /> - <ClInclude Include="..\..\..\Runtime\Graphics\OpenGL.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBind.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindClass.hpp" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindConfig.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindEnum.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindGlobalState.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindInternal.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRef.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindState.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindUtility.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindVM.h" /> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.h" /> - <ClInclude Include="..\..\..\Runtime\Math\AABB.h" /> - <ClInclude Include="..\..\..\Runtime\Math\FloatConversion.h" /> - <ClInclude Include="..\..\..\Runtime\Math\Rect.h" /> - <ClInclude Include="..\..\..\Runtime\Math\Vector2.h" /> - <ClInclude Include="..\..\..\Runtime\Math\Vector3.h" /> - <ClInclude Include="..\..\..\Runtime\Utilities\Assert.h" /> - <ClInclude Include="..\..\..\Runtime\Utilities\Base64.h" /> - <ClInclude Include="..\..\..\Runtime\Utilities\Exception.h" /> - <ClInclude Include="..\..\..\Runtime\Utilities\NonCopyable.h" /> - <ClInclude Include="..\..\..\Runtime\Utilities\Singleton.h" /> - <ClInclude Include="..\..\..\Runtime\Utilities\Type.h" /> - <ClInclude Include="..\..\..\Runtime\Utilities\UIDGenerator.h" /> - <ClInclude Include="..\..\..\Runtime\Utilities\Utf8.h" /> - <ClInclude Include="..\..\..\Runtime\Utilities\UtilMacros.h" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\glad\glad.vcxproj"> - <Project>{385f2d3a-1cef-4aa1-8051-527f6b68dd81}</Project> - </ProjectReference> - <ProjectReference Include="..\lua51\lua51.vcxproj"> - <Project>{ad09415f-4bf9-4fce-901f-7ab22d429cfc}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="..\..\..\Runtime\LuaBind\LuaBindClass.inc" /> - <None Include="..\..\..\Runtime\LuaBind\LuaBindState.inc" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> +<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>15.0</VCProjectVersion>
+ <ProjectGuid>{CB47B19A-6649-4A1A-8FE5-6359178AA48F}</ProjectGuid>
+ <RootNamespace>Editor</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(SolutionDir)..\..\Build</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(SolutionDir)..\..\Build</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(SolutionDir)..\..\Build</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>$(SolutionDir)..\..\Build</OutDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;GAMELAB_DEBUG;GAMELAB_EDITOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(SolutionDir)..\..\ThirdParty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\Editor\EditorApplication.cpp" />
+ <ClCompile Include="..\..\..\Editor\EditorMain.cpp" />
+ <ClCompile Include="..\..\..\Editor\EditorManager.cpp" />
+ <ClCompile Include="..\..\..\Editor\Graphics\Graphics.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\Editor\Editor.bind.cpp" />
+ <ClCompile Include="..\..\..\Editor\Scripting\Editor\EditorApplication.bind.cpp" />
+ <ClCompile Include="..\..\..\Editor\Scripting\IMGUI\GUIButton.bind.cpp" />
+ <ClCompile Include="..\..\..\Editor\Shaders\BuiltinShaders.cpp" />
+ <ClCompile Include="..\..\..\Editor\Utils\HelperFuncs.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Debug\Log.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Graphics\OpenGL.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindCFunctions.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindEnum.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindMemberRef.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindRef.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindRefTable.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindState.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindVM.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindWatchDog.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaHelper.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Scripting\Debug\Debug.bind.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Scripting\GL\GL.bind.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\Editor\EditorApplication.h" />
+ <ClInclude Include="..\..\..\Editor\EditorManager.h" />
+ <ClInclude Include="..\..\..\Editor\Graphics\Graphics.h" />
+ <ClInclude Include="..\..\..\Editor\GUI\Dock.h" />
+ <ClInclude Include="..\..\..\Editor\GUI\EditorWindows.h" />
+ <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\Shaders\BuiltinShaders.h" />
+ <ClInclude Include="..\..\..\Editor\Utils\HelperFuncs.h" />
+ <ClInclude Include="..\..\..\Runtime\Debug\Log.h" />
+ <ClInclude Include="..\..\..\Runtime\Graphics\OpenGL.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBind.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindCFunctions.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.hpp" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindConfig.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindEnum.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindGlobalState.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindInternal.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindMemberRef.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindRef.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindRefTable.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindState.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindUtility.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindVM.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindWatchDog.h" />
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaHelper.h" />
+ <ClInclude Include="..\..\..\Runtime\Math\AABB.h" />
+ <ClInclude Include="..\..\..\Runtime\Math\FloatConversion.h" />
+ <ClInclude Include="..\..\..\Runtime\Math\Rect.h" />
+ <ClInclude Include="..\..\..\Runtime\Math\Vector2.h" />
+ <ClInclude Include="..\..\..\Runtime\Math\Vector3.h" />
+ <ClInclude Include="..\..\..\Runtime\Utilities\Assert.h" />
+ <ClInclude Include="..\..\..\Runtime\Utilities\Base64.h" />
+ <ClInclude Include="..\..\..\Runtime\Utilities\Exception.h" />
+ <ClInclude Include="..\..\..\Runtime\Utilities\NonCopyable.h" />
+ <ClInclude Include="..\..\..\Runtime\Utilities\Singleton.h" />
+ <ClInclude Include="..\..\..\Runtime\Utilities\Type.h" />
+ <ClInclude Include="..\..\..\Runtime\Utilities\UIDGenerator.h" />
+ <ClInclude Include="..\..\..\Runtime\Utilities\Utf8.h" />
+ <ClInclude Include="..\..\..\Runtime\Utilities\UtilMacros.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\glad\glad.vcxproj">
+ <Project>{385f2d3a-1cef-4aa1-8051-527f6b68dd81}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\lua51\lua51.vcxproj">
+ <Project>{ad09415f-4bf9-4fce-901f-7ab22d429cfc}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.inc" />
+ <None Include="..\..\..\Runtime\Lua\LuaBind\LuaBindState.inc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
</Project>
\ No newline at end of file diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters index 88ad2a6..5062a9f 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters +++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters @@ -1,320 +1,347 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Editor"> - <UniqueIdentifier>{37e66f64-a2fe-4adf-b435-e2e42ea17414}</UniqueIdentifier> - </Filter> - <Filter Include="Runtime"> - <UniqueIdentifier>{376fd2a5-5333-4bcb-9122-a112c40d5287}</UniqueIdentifier> - </Filter> - <Filter Include="Runtime\Math"> - <UniqueIdentifier>{ed31f129-996f-4a1c-b8d5-5c3d74139940}</UniqueIdentifier> - </Filter> - <Filter Include="Runtime\Utilities"> - <UniqueIdentifier>{61174975-2b52-426f-b871-d33e1bf956d4}</UniqueIdentifier> - </Filter> - <Filter Include="Editor\Utils"> - <UniqueIdentifier>{e7e5a875-cafb-48df-9659-8f88d0377208}</UniqueIdentifier> - </Filter> - <Filter Include="Editor\GUI"> - <UniqueIdentifier>{87a57ef1-78d8-42b8-b179-ce1bbb5c4f8b}</UniqueIdentifier> - </Filter> - <Filter Include="Runtime\Graphics"> - <UniqueIdentifier>{6c7e1979-1cd3-40c7-98e1-f063c325d642}</UniqueIdentifier> - </Filter> - <Filter Include="Editor\IMGUI"> - <UniqueIdentifier>{47032dd6-dca2-478f-b594-d08c0b22e119}</UniqueIdentifier> - </Filter> - <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> - <Filter Include="Runtime\LuaBind"> - <UniqueIdentifier>{f9573ff2-4a53-4953-806e-f0ce0c586910}</UniqueIdentifier> - </Filter> - <Filter Include="Runtime\Scripting"> - <UniqueIdentifier>{c1e200c9-0eec-40e2-a69f-ccaaaa208200}</UniqueIdentifier> - </Filter> - <Filter Include="Runtime\Scripting\GL"> - <UniqueIdentifier>{0d57b53a-e29a-4ece-a6d8-f5aa13d15891}</UniqueIdentifier> - </Filter> - <Filter Include="Editor\Shaders"> - <UniqueIdentifier>{707a995f-6856-44c8-857c-14e7834e86e3}</UniqueIdentifier> - </Filter> - <Filter Include="Runtime\Debug"> - <UniqueIdentifier>{df6cfcb1-ec0a-4b6d-b80d-8ee197425509}</UniqueIdentifier> - </Filter> - <Filter Include="Runtime\Scripting\Debug"> - <UniqueIdentifier>{be13ccc9-0b31-4d22-b512-e2a05d7f3c5b}</UniqueIdentifier> - </Filter> - <Filter Include="Editor\Scripting\Editor"> - <UniqueIdentifier>{1186771e-bd0f-45de-94a4-373ab489d274}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp"> - <Filter>Editor\GUI</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp"> - <Filter>Runtime\Math</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp"> - <Filter>Runtime\Math</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp"> - <Filter>Runtime\Utilities</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp"> - <Filter>Runtime\Utilities</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp"> - <Filter>Editor\GUI</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\GUI\ContainnerWindow.cpp"> - <Filter>Editor\GUI</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\GUI\GUIWindow.cpp"> - <Filter>Editor\GUI</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\GUI\SplitWindow.cpp"> - <Filter>Editor\GUI</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\GUI\WindowUtil.cpp"> - <Filter>Editor\GUI</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\GUI\WindowManager.cpp"> - <Filter>Editor\GUI</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\EditorMain.cpp"> - <Filter>Editor</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\EditorManager.cpp"> - <Filter>Editor</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\GUI\MenuManager.cpp"> - <Filter>Editor\GUI</Filter> - </ClCompile> - <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> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.cpp"> - <Filter>Runtime\LuaBind</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindClass.cpp"> - <Filter>Runtime\LuaBind</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindEnum.cpp"> - <Filter>Runtime\LuaBind</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.cpp"> - <Filter>Runtime\LuaBind</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRef.cpp"> - <Filter>Runtime\LuaBind</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.cpp"> - <Filter>Runtime\LuaBind</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindState.cpp"> - <Filter>Runtime\LuaBind</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindVM.cpp"> - <Filter>Runtime\LuaBind</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.cpp"> - <Filter>Runtime\LuaBind</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\Shaders\BuiltinShaders.cpp"> - <Filter>Editor\Shaders</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\Debug\Log.cpp"> - <Filter>Runtime\Debug</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\Scripting\GL\GL.bind.cpp"> - <Filter>Runtime\Scripting\GL</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\Scripting\Debug\Debug.bind.cpp"> - <Filter>Runtime\Scripting\Debug</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Runtime\Graphics\OpenGL.cpp"> - <Filter>Runtime\Graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\Scripting\Editor\EditorApplication.bind.cpp"> - <Filter>Editor\Scripting\Editor</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Editor\Scripting\Editor\Editor.bind.cpp"> - <Filter>Editor\Scripting\Editor</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\Editor\GUI\Dock.h"> - <Filter>Editor\GUI</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Editor\GUI\EditorWindows.h"> - <Filter>Editor\GUI</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Math\AABB.h"> - <Filter>Runtime\Math</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Math\FloatConversion.h"> - <Filter>Runtime\Math</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Math\Rect.h"> - <Filter>Runtime\Math</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Math\Vector2.h"> - <Filter>Runtime\Math</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Math\Vector3.h"> - <Filter>Runtime\Math</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Utilities\Assert.h"> - <Filter>Runtime\Utilities</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Utilities\Base64.h"> - <Filter>Runtime\Utilities</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Utilities\Exception.h"> - <Filter>Runtime\Utilities</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Utilities\NonCopyable.h"> - <Filter>Runtime\Utilities</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Utilities\Singleton.h"> - <Filter>Runtime\Utilities</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Utilities\Type.h"> - <Filter>Runtime\Utilities</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Utilities\UIDGenerator.h"> - <Filter>Runtime\Utilities</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Utilities\Utf8.h"> - <Filter>Runtime\Utilities</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Utilities\UtilMacros.h"> - <Filter>Runtime\Utilities</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h"> - <Filter>Editor\GUI</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Editor\GUI\Rect.h"> - <Filter>Editor\GUI</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Editor\EditorManager.h"> - <Filter>Editor</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Editor\Utils\HelperFuncs.h"> - <Filter>Editor\Utils</Filter> - </ClInclude> - <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> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBind.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindClass.hpp"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindConfig.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindEnum.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindGlobalState.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindInternal.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRef.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindState.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindUtility.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindVM.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.h"> - <Filter>Runtime\LuaBind</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Editor\Shaders\BuiltinShaders.h"> - <Filter>Editor\Shaders</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Debug\Log.h"> - <Filter>Runtime\Debug</Filter> - </ClInclude> - <ClInclude Include="..\..\..\Runtime\Graphics\OpenGL.h"> - <Filter>Runtime\Graphics</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="..\..\..\Runtime\LuaBind\LuaBindClass.inc"> - <Filter>Runtime\LuaBind</Filter> - </None> - <None Include="..\..\..\Runtime\LuaBind\LuaBindState.inc"> - <Filter>Runtime\LuaBind</Filter> - </None> - </ItemGroup> +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Editor">
+ <UniqueIdentifier>{37e66f64-a2fe-4adf-b435-e2e42ea17414}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime">
+ <UniqueIdentifier>{376fd2a5-5333-4bcb-9122-a112c40d5287}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime\Math">
+ <UniqueIdentifier>{ed31f129-996f-4a1c-b8d5-5c3d74139940}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime\Utilities">
+ <UniqueIdentifier>{61174975-2b52-426f-b871-d33e1bf956d4}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Editor\Utils">
+ <UniqueIdentifier>{e7e5a875-cafb-48df-9659-8f88d0377208}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Editor\GUI">
+ <UniqueIdentifier>{87a57ef1-78d8-42b8-b179-ce1bbb5c4f8b}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime\Graphics">
+ <UniqueIdentifier>{6c7e1979-1cd3-40c7-98e1-f063c325d642}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Editor\IMGUI">
+ <UniqueIdentifier>{47032dd6-dca2-478f-b594-d08c0b22e119}</UniqueIdentifier>
+ </Filter>
+ <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>
+ <Filter Include="Runtime\Scripting">
+ <UniqueIdentifier>{c1e200c9-0eec-40e2-a69f-ccaaaa208200}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime\Scripting\GL">
+ <UniqueIdentifier>{0d57b53a-e29a-4ece-a6d8-f5aa13d15891}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Editor\Shaders">
+ <UniqueIdentifier>{707a995f-6856-44c8-857c-14e7834e86e3}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime\Debug">
+ <UniqueIdentifier>{df6cfcb1-ec0a-4b6d-b80d-8ee197425509}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime\Scripting\Debug">
+ <UniqueIdentifier>{be13ccc9-0b31-4d22-b512-e2a05d7f3c5b}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Editor\Scripting\Editor">
+ <UniqueIdentifier>{1186771e-bd0f-45de-94a4-373ab489d274}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Editor\Graphics">
+ <UniqueIdentifier>{66d581bf-85b1-4108-b1e1-d5e44f391af8}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime\LuaUtils">
+ <UniqueIdentifier>{8810f29e-3166-4dd6-af85-8eebab583f0c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime\Lua">
+ <UniqueIdentifier>{d076ff69-6f78-4c7d-be95-e59daf26a3e2}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime\Lua\LuaBind">
+ <UniqueIdentifier>{f9573ff2-4a53-4953-806e-f0ce0c586910}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp">
+ <Filter>Editor\GUI</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp">
+ <Filter>Runtime\Math</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp">
+ <Filter>Runtime\Math</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp">
+ <Filter>Runtime\Utilities</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp">
+ <Filter>Runtime\Utilities</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp">
+ <Filter>Editor\GUI</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\GUI\ContainnerWindow.cpp">
+ <Filter>Editor\GUI</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\GUI\GUIWindow.cpp">
+ <Filter>Editor\GUI</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\GUI\SplitWindow.cpp">
+ <Filter>Editor\GUI</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\GUI\WindowUtil.cpp">
+ <Filter>Editor\GUI</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\GUI\WindowManager.cpp">
+ <Filter>Editor\GUI</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\EditorMain.cpp">
+ <Filter>Editor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\EditorManager.cpp">
+ <Filter>Editor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\GUI\MenuManager.cpp">
+ <Filter>Editor\GUI</Filter>
+ </ClCompile>
+ <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>
+ <ClCompile Include="..\..\..\Editor\Shaders\BuiltinShaders.cpp">
+ <Filter>Editor\Shaders</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Debug\Log.cpp">
+ <Filter>Runtime\Debug</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Scripting\GL\GL.bind.cpp">
+ <Filter>Runtime\Scripting\GL</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Scripting\Debug\Debug.bind.cpp">
+ <Filter>Runtime\Scripting\Debug</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Graphics\OpenGL.cpp">
+ <Filter>Runtime\Graphics</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\Scripting\Editor\EditorApplication.bind.cpp">
+ <Filter>Editor\Scripting\Editor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\Scripting\Editor\Editor.bind.cpp">
+ <Filter>Editor\Scripting\Editor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\EditorApplication.cpp">
+ <Filter>Editor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Editor\Graphics\Graphics.cpp">
+ <Filter>Editor\Graphics</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindCFunctions.cpp">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.cpp">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindEnum.cpp">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindMemberRef.cpp">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindRef.cpp">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindRefTable.cpp">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindState.cpp">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindVM.cpp">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindWatchDog.cpp">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Lua\LuaHelper.cpp">
+ <Filter>Runtime\Lua</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\Editor\GUI\Dock.h">
+ <Filter>Editor\GUI</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Editor\GUI\EditorWindows.h">
+ <Filter>Editor\GUI</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Math\AABB.h">
+ <Filter>Runtime\Math</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Math\FloatConversion.h">
+ <Filter>Runtime\Math</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Math\Rect.h">
+ <Filter>Runtime\Math</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Math\Vector2.h">
+ <Filter>Runtime\Math</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Math\Vector3.h">
+ <Filter>Runtime\Math</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Utilities\Assert.h">
+ <Filter>Runtime\Utilities</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Utilities\Base64.h">
+ <Filter>Runtime\Utilities</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Utilities\Exception.h">
+ <Filter>Runtime\Utilities</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Utilities\NonCopyable.h">
+ <Filter>Runtime\Utilities</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Utilities\Singleton.h">
+ <Filter>Runtime\Utilities</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Utilities\Type.h">
+ <Filter>Runtime\Utilities</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Utilities\UIDGenerator.h">
+ <Filter>Runtime\Utilities</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Utilities\Utf8.h">
+ <Filter>Runtime\Utilities</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Utilities\UtilMacros.h">
+ <Filter>Runtime\Utilities</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h">
+ <Filter>Editor\GUI</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Editor\GUI\Rect.h">
+ <Filter>Editor\GUI</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Editor\EditorManager.h">
+ <Filter>Editor</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Editor\Utils\HelperFuncs.h">
+ <Filter>Editor\Utils</Filter>
+ </ClInclude>
+ <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>
+ <ClInclude Include="..\..\..\Editor\Shaders\BuiltinShaders.h">
+ <Filter>Editor\Shaders</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Debug\Log.h">
+ <Filter>Runtime\Debug</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Graphics\OpenGL.h">
+ <Filter>Runtime\Graphics</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Editor\EditorApplication.h">
+ <Filter>Editor</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Editor\Graphics\Graphics.h">
+ <Filter>Editor\Graphics</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBind.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindCFunctions.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.hpp">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindConfig.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindEnum.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindGlobalState.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindInternal.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindMemberRef.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindRef.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindRefTable.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindState.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindUtility.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindVM.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindWatchDog.h">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Lua\LuaHelper.h">
+ <Filter>Runtime\Lua</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.inc">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </None>
+ <None Include="..\..\..\Runtime\Lua\LuaBind\LuaBindState.inc">
+ <Filter>Runtime\Lua\LuaBind</Filter>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.user b/Projects/VisualStudio/Editor/Editor.vcxproj.user index db52b6c..f86de5d 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj.user +++ b/Projects/VisualStudio/Editor/Editor.vcxproj.user @@ -1,7 +1,10 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\Resources</LocalDebuggerWorkingDirectory> - <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> - </PropertyGroup> +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\Resources</LocalDebuggerWorkingDirectory>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ShowAllFiles>true</ShowAllFiles>
+ </PropertyGroup>
</Project>
\ No newline at end of file diff --git a/Resources/Scripts/Editor/ProjectWindow.lua b/Resources/Scripts/Editor/ProjectWindow.lua new file mode 100644 index 0000000..18959f2 --- /dev/null +++ b/Resources/Scripts/Editor/ProjectWindow.lua @@ -0,0 +1,18 @@ +local GUI = GameLab.Editor.GUI
+local GUILayout = GameLab.Editor.GUILayout
+
+local ProjectWindow = {
+ ["name"] = "Project",
+}
+
+ProjectWindow.OnGUI = function(self)
+ if GUILayout.Button("click") then
+
+ end
+end
+
+ProjectWindow.OnUpdate = function(self)
+
+end
+
+GUI.RegisterEditorWindow("Project", ProjectWindow, "Custom/Project")
\ No newline at end of file diff --git a/Resources/Scripts/EditorApplication.lua b/Resources/Scripts/EditorApplication.lua index 935547d..c8438cf 100644 --- a/Resources/Scripts/EditorApplication.lua +++ b/Resources/Scripts/EditorApplication.lua @@ -1,19 +1,27 @@ +require "./Scripts/Utils/Utils" + local Debug = GameLab.Debug local GUI = GameLab.Editor.GUI +local app = GameLab.Editor.EditorApplication.New() -Debug.OpenTag("WndProc") - -Debug.Log("WndProc", "123") +if app == nil then + Debug.LogError("app is nil") +end -local i = 0 -while i < 10 do +local mainWindow = GUI.ContainnerWindow.New({400, 400, 800, 500}, GUI.EShowMode.MainWindow, {100, 100}, {700, 700}) +mainWindow:SetTitle("GameLab") +mainWindow:SetIcon("./Icon/GameLab.ico") - i = i + 1 - Debug.Log(i) +app:SetMainWindow(mainWindow) +app:SetupMenu() -end +local guiWindow = GUI.GUIWindow.New() +guiWindow:SetContainnerWindow(mainWindow) +guiWindow:SetPosition({0,0, 500, 400}) +while true do -Debug.Log(GUI.EShowMode.NoShadow) + app:PullMessage() +end
\ No newline at end of file diff --git a/Resources/Scripts/Utils/Utils.lua b/Resources/Scripts/Utils/Utils.lua new file mode 100644 index 0000000..678217b --- /dev/null +++ b/Resources/Scripts/Utils/Utils.lua @@ -0,0 +1,4 @@ +local Utils = GameLab.Editor.Utils or {}
+GameLab.Editor.Utils = Utils
+
+
diff --git a/Runtime/LuaBind/LuaBind.h b/Runtime/Lua/LuaBind/LuaBind.h index 1494b5c..1494b5c 100644 --- a/Runtime/LuaBind/LuaBind.h +++ b/Runtime/Lua/LuaBind/LuaBind.h diff --git a/Runtime/LuaBind/LuaBindCFunctions.cpp b/Runtime/Lua/LuaBind/LuaBindCFunctions.cpp index ca662a3..ca662a3 100644 --- a/Runtime/LuaBind/LuaBindCFunctions.cpp +++ b/Runtime/Lua/LuaBind/LuaBindCFunctions.cpp diff --git a/Runtime/LuaBind/LuaBindCFunctions.h b/Runtime/Lua/LuaBind/LuaBindCFunctions.h index f0f07dd..f0f07dd 100644 --- a/Runtime/LuaBind/LuaBindCFunctions.h +++ b/Runtime/Lua/LuaBind/LuaBindCFunctions.h diff --git a/Runtime/LuaBind/LuaBindClass.cpp b/Runtime/Lua/LuaBind/LuaBindClass.cpp index 7fd603c..7fd603c 100644 --- a/Runtime/LuaBind/LuaBindClass.cpp +++ b/Runtime/Lua/LuaBind/LuaBindClass.cpp diff --git a/Runtime/LuaBind/LuaBindClass.hpp b/Runtime/Lua/LuaBind/LuaBindClass.hpp index c27af4e..2bf1451 100644 --- a/Runtime/LuaBind/LuaBindClass.hpp +++ b/Runtime/Lua/LuaBind/LuaBindClass.hpp @@ -139,9 +139,10 @@ namespace LuaBind // ¹¤³§ÀàÏà¹Ø static int __gc (lua_State*); static int _GetRefTable (lua_State*); - static int _New (lua_State*); #if LUA_BIND_ENABLE_NATIVE_EXTEND + static int _New(lua_State*); + static int _ExtendFactory (lua_State*); static int _ExtendSingleton (lua_State*); #endif diff --git a/Runtime/LuaBind/LuaBindClass.inc b/Runtime/Lua/LuaBind/LuaBindClass.inc index 1d05f98..05bd9c7 100644 --- a/Runtime/LuaBind/LuaBindClass.inc +++ b/Runtime/Lua/LuaBind/LuaBindClass.inc @@ -238,7 +238,6 @@ namespace LuaBind return false; } - // // ´´½¨userdata£¬²¢ÒÔ´ËÌí¼Óref table£¬member tableºÍclass table¡£ // ref table ÊÇkvÇ¿ÒýÓÃtable£¬±£´æ¶ÔÆäËûuserdataµÄÒýÓüÆÊý£¨Í¨¹ýuserdata×÷Ϊkey£¬ // ¼ÆÊýΪvalue£©£¬ÒÔ¼°³ÉÔ±ÒýÓà @@ -246,7 +245,6 @@ namespace LuaBind // class table ËùÓб¾ÀàÐ͵ÄʵÀý¹²Óеĺ¯Êý±í // // BindToLuaÖ»»áÔÚµÚÒ»´Î×¢²á¸øLuaÐéÄâ»úʱµ÷Óᣠ- // template<class TYPE, class BASE> void NativeClass<TYPE, BASE>::BindToLua(State& state) { @@ -254,11 +252,9 @@ namespace LuaBind assert(!TYPE::IsClassSingleton()); assert(!mUserdata); - // // ´´½¨userdata²¢ÁôÔÚÕ»¶¥£¬×¢ÒâµØַҪת»»ÎªTYPE*£¬Ö±½ÓÓÃthis¿ÉÄܻᵼÖ¶àÖؼ̳еÄÀàɥʧ¶à̬¡£ // Èç¹ûÖ±½Ó´«this½øÈ¥£¬ÔÚ¶àÖؼ̳ÐÇé¿öÏ£¬ÊÇÄò»µ½ÁíһͷµÄÐ麯Êý±íµÄ¡£ËùÒÔÕâÀïÐèÒª½«this // ת»»ÎªÕû¸ö¶ÔÏóµÄµÍµØÖ·£¬ÕâÑù¿ÉÒÔÄõ½ÁíÒ»¸ö»ùÀàµÄÐ麯Êý±í£¬Í¨¹ýÁíÒ»¸ö»ùÀàʵÏÖ¶à̬¡£ - // TYPE* p = static_cast<TYPE*>(this); state.PushPtrUserdata(p); @@ -433,10 +429,8 @@ namespace LuaBind } #if LUA_BIND_ENABLE_NATIVE_EXTEND - // // ÅÉÉú³ö×ÓÀ࣬ÔÚluaÀï¶ÔÅÉÉúÀàµÄ³ÉÔ±ºÍÐÐΪ½øÐÐÖØÐÂÉè¼Æ£¬µ«ÊDZ£Ö¤ÁËuserdataµÄͳһ¡£Native classµÄÅÉÉúÌṩ__initÖ§³Ö£¬ÔÚ // nativeʵÌå´´½¨ºó¿ÉÒÔʹÓÃ__init½øÐгõʼ»¯£¬ÅÉÉúÀàÓµÓкͻùÀàÒ»ÑùµÄNew²ÎÊýÁÐ±í£¬ÇÒnative¶ÔÏóÊÇÒ»ÑùµÄÀàÐÍ¡£ - // template<class TYPE, class BASE> int NativeClass<TYPE, BASE>::_ExtendFactory(lua_State* L) { @@ -534,29 +528,6 @@ namespace LuaBind return 1; } -#endif /*LUA_BIND_ENABLE_NATIVE_EXTEND*/ - - template<class TYPE, class BASE> - int NativeClass<TYPE, BASE>::_GetClass(lua_State* L) - { - LUA_BIND_STATE(L); - if (!mClassTable) - lua_pushnil(L); - else - mClassTable.PushRef(state); - return 1; - } - - template<class TYPE, class BASE> - int NativeClass<TYPE, BASE>::_GetRefTable(lua_State* L) - { - LUA_BIND_STATE(L); - TYPE* self = state.GetUserdata<TYPE>(1); - bool success = self->PushRefTable(state); - if (!success) - lua_pushnil(L); - return 1; - } template<class TYPE, class BASE> int NativeClass<TYPE, BASE>::_New(lua_State* L) @@ -631,6 +602,30 @@ namespace LuaBind return 0; } +#endif /*LUA_BIND_ENABLE_NATIVE_EXTEND*/ + + template<class TYPE, class BASE> + int NativeClass<TYPE, BASE>::_GetClass(lua_State* L) + { + LUA_BIND_STATE(L); + if (!mClassTable) + lua_pushnil(L); + else + mClassTable.PushRef(state); + return 1; + } + + template<class TYPE, class BASE> + int NativeClass<TYPE, BASE>::_GetRefTable(lua_State* L) + { + LUA_BIND_STATE(L); + TYPE* self = state.GetUserdata<TYPE>(1); + bool success = self->PushRefTable(state); + if (!success) + lua_pushnil(L); + return 1; + } + template<class TYPE, class BASE> StrongRef NativeClass<TYPE, BASE>::mClassTable; // class table template<class TYPE, class BASE> StrongRef NativeClass<TYPE, BASE>::mSingletonRefTable; // µ¥Àý diff --git a/Runtime/LuaBind/LuaBindConfig.h b/Runtime/Lua/LuaBind/LuaBindConfig.h index 72709bd..ded072e 100644 --- a/Runtime/LuaBind/LuaBindConfig.h +++ b/Runtime/Lua/LuaBind/LuaBindConfig.h @@ -50,10 +50,9 @@ namespace LuaBind #define LUA_BIND_API LUA_BIND_LIBRARY_EXPORT #endif -#define LUA_BIND_ENABLE_NATIVE_EXTEND 0 - -#define LUA_BIND_ENABLE_PLAIN_CLASS 0 -#define LUA_BIND_ENABLE_PLAIN_ENUM 0 +#define LUA_BIND_ENABLE_NATIVE_EXTEND 0 +#define LUA_BIND_ENABLE_PLAIN_CLASS 0 +#define LUA_BIND_ENABLE_PLAIN_ENUM 0 #define LUA_BIND_PROFILER 1 diff --git a/Runtime/LuaBind/LuaBindEnum.cpp b/Runtime/Lua/LuaBind/LuaBindEnum.cpp index 63e2567..63e2567 100644 --- a/Runtime/LuaBind/LuaBindEnum.cpp +++ b/Runtime/Lua/LuaBind/LuaBindEnum.cpp diff --git a/Runtime/LuaBind/LuaBindEnum.h b/Runtime/Lua/LuaBind/LuaBindEnum.h index 122e845..122e845 100644 --- a/Runtime/LuaBind/LuaBindEnum.h +++ b/Runtime/Lua/LuaBind/LuaBindEnum.h diff --git a/Runtime/LuaBind/LuaBindGlobalState.h b/Runtime/Lua/LuaBind/LuaBindGlobalState.h index fa3cc4f..fa3cc4f 100644 --- a/Runtime/LuaBind/LuaBindGlobalState.h +++ b/Runtime/Lua/LuaBind/LuaBindGlobalState.h diff --git a/Runtime/LuaBind/LuaBindInternal.h b/Runtime/Lua/LuaBind/LuaBindInternal.h index 1d4a226..1d4a226 100644 --- a/Runtime/LuaBind/LuaBindInternal.h +++ b/Runtime/Lua/LuaBind/LuaBindInternal.h diff --git a/Runtime/LuaBind/LuaBindMemberRef.cpp b/Runtime/Lua/LuaBind/LuaBindMemberRef.cpp index e680cce..e680cce 100644 --- a/Runtime/LuaBind/LuaBindMemberRef.cpp +++ b/Runtime/Lua/LuaBind/LuaBindMemberRef.cpp diff --git a/Runtime/LuaBind/LuaBindMemberRef.h b/Runtime/Lua/LuaBind/LuaBindMemberRef.h index 045d6ef..045d6ef 100644 --- a/Runtime/LuaBind/LuaBindMemberRef.h +++ b/Runtime/Lua/LuaBind/LuaBindMemberRef.h diff --git a/Runtime/LuaBind/LuaBindRef.cpp b/Runtime/Lua/LuaBind/LuaBindRef.cpp index 00a65d0..00a65d0 100644 --- a/Runtime/LuaBind/LuaBindRef.cpp +++ b/Runtime/Lua/LuaBind/LuaBindRef.cpp diff --git a/Runtime/LuaBind/LuaBindRef.h b/Runtime/Lua/LuaBind/LuaBindRef.h index 93b30be..93b30be 100644 --- a/Runtime/LuaBind/LuaBindRef.h +++ b/Runtime/Lua/LuaBind/LuaBindRef.h diff --git a/Runtime/LuaBind/LuaBindRefTable.cpp b/Runtime/Lua/LuaBind/LuaBindRefTable.cpp index 39ef9ab..39ef9ab 100644 --- a/Runtime/LuaBind/LuaBindRefTable.cpp +++ b/Runtime/Lua/LuaBind/LuaBindRefTable.cpp diff --git a/Runtime/LuaBind/LuaBindRefTable.h b/Runtime/Lua/LuaBind/LuaBindRefTable.h index 0d4c2d4..0d4c2d4 100644 --- a/Runtime/LuaBind/LuaBindRefTable.h +++ b/Runtime/Lua/LuaBind/LuaBindRefTable.h diff --git a/Runtime/LuaBind/LuaBindState.cpp b/Runtime/Lua/LuaBind/LuaBindState.cpp index 4ee87f4..4ee87f4 100644 --- a/Runtime/LuaBind/LuaBindState.cpp +++ b/Runtime/Lua/LuaBind/LuaBindState.cpp diff --git a/Runtime/LuaBind/LuaBindState.h b/Runtime/Lua/LuaBind/LuaBindState.h index 776b23d..776b23d 100644 --- a/Runtime/LuaBind/LuaBindState.h +++ b/Runtime/Lua/LuaBind/LuaBindState.h diff --git a/Runtime/LuaBind/LuaBindState.inc b/Runtime/Lua/LuaBind/LuaBindState.inc index 4e7090d..4e7090d 100644 --- a/Runtime/LuaBind/LuaBindState.inc +++ b/Runtime/Lua/LuaBind/LuaBindState.inc diff --git a/Runtime/LuaBind/LuaBindUtility.h b/Runtime/Lua/LuaBind/LuaBindUtility.h index edc5b18..ffc5099 100644 --- a/Runtime/LuaBind/LuaBindUtility.h +++ b/Runtime/Lua/LuaBind/LuaBindUtility.h @@ -59,6 +59,9 @@ LUA_BIND_STATE(L); \ T* self = state.GetUserdata<T>(1); +#define LUA_BIND_CHECK(L, params)\ + if(!state.CheckParams(1, params)) return 0 + #define LUA_BIND_INHERIT(state, type) type::RegisterClass(state) #define luaxport private diff --git a/Runtime/LuaBind/LuaBindVM.cpp b/Runtime/Lua/LuaBind/LuaBindVM.cpp index 268a5ed..268a5ed 100644 --- a/Runtime/LuaBind/LuaBindVM.cpp +++ b/Runtime/Lua/LuaBind/LuaBindVM.cpp diff --git a/Runtime/LuaBind/LuaBindVM.h b/Runtime/Lua/LuaBind/LuaBindVM.h index 3bfe899..3bfe899 100644 --- a/Runtime/LuaBind/LuaBindVM.h +++ b/Runtime/Lua/LuaBind/LuaBindVM.h diff --git a/Runtime/LuaBind/LuaBindWatchDog.cpp b/Runtime/Lua/LuaBind/LuaBindWatchDog.cpp index e69de29..e69de29 100644 --- a/Runtime/LuaBind/LuaBindWatchDog.cpp +++ b/Runtime/Lua/LuaBind/LuaBindWatchDog.cpp diff --git a/Runtime/LuaBind/LuaBindWatchDog.h b/Runtime/Lua/LuaBind/LuaBindWatchDog.h index 794faa9..794faa9 100644 --- a/Runtime/LuaBind/LuaBindWatchDog.h +++ b/Runtime/Lua/LuaBind/LuaBindWatchDog.h diff --git a/Runtime/Lua/LuaHelper.cpp b/Runtime/Lua/LuaHelper.cpp new file mode 100644 index 0000000..289f0f6 --- /dev/null +++ b/Runtime/Lua/LuaHelper.cpp @@ -0,0 +1,23 @@ +#include "LuaHelper.h"
+
+using namespace LuaBind;
+
+template <> +Rectf State::GetValue < Rectf >(int idx, const Rectf value)
+{
+ Rectf rect;
+ rect.x = GetField<float>(idx, 1, 0); + rect.y = GetField<float>(idx, 2, 0); + rect.width = GetField<float>(idx, 3, 0); + rect.height = GetField<float>(idx, 4, 0); + return rect;
+}
+
+template <> +Vector2f State::GetValue < Vector2f >(int idx, const Vector2f value)
+{
+ Vector2f v2; + v2.x = GetField<float>(idx, 1, 0); + v2.y = GetField<float>(idx, 2, 0); + return v2;
+}
diff --git a/Runtime/Lua/LuaHelper.h b/Runtime/Lua/LuaHelper.h new file mode 100644 index 0000000..5e9bf90 --- /dev/null +++ b/Runtime/Lua/LuaHelper.h @@ -0,0 +1,10 @@ +#pragma once
+#include "Runtime/Math/Rect.h"
+#include "Runtime/Math/Vector2.h"
+#include "./LuaBind/LuaBind.h"
+
+class LuaHelper
+{
+public:
+
+};
diff --git a/Runtime/Scripting/GL/GL.bind.cpp b/Runtime/Scripting/GL/GL.bind.cpp index 57dba09..bed55ca 100644 --- a/Runtime/Scripting/GL/GL.bind.cpp +++ b/Runtime/Scripting/GL/GL.bind.cpp @@ -1,5 +1,5 @@ #include "Runtime/Graphics/OpenGL.h" -#include "Runtime/LuaBind/LuaBind.h" +#include "Runtime/Lua/LuaBind/LuaBind.h" // GameLab.Engine.GL void luaopen_GameLab_Engine_GL(lua_State* L) |
