1 files changed, 3 insertions, 45 deletions

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