*class

1 files changed, 104 insertions, 74 deletions

diff --git a/Editor/Scripting/Window/EditorGUI.bind.cpp b/Editor/Scripting/Window/Window.bind.cpp
index 838e752..b720c98 100644
--- a/Editor/Scripting/Window/EditorGUI.bind.cpp
+++ b/Editor/Scripting/Window/Window.bind.cpp
@@ -1,88 +1,102 @@
 #include "Editor/GUI/EditorWindows.h"
-#include "Runtime/GUI/Font.h"

+#include "Runtime/GUI/Font.h"
 #include "Runtime/Graphics/Shader.h"
 #include "Runtime/Debug/Log.h"
 #include "Runtime/Graphics/GfxDevice.h"
-#include "Runtime/Common/DataBuffer.h"

-#include "Runtime/GUI/utf8.h"

-#include "Runtime/Utilities/StaticInitiator.h"

-#include "Runtime/GUI/UITextMesh.h"

+#include "Runtime/Common/DataBuffer.h"
+#include "Runtime/GUI/utf8.h"
+#include "Runtime/Utilities/StaticInitiator.h"
+#include "Runtime/GUI/UITextMesh.h"
 #include "Runtime/Math/Math.h"
 #include "Runtime/GUI/TextMeshGenerator.h"
 #include "Runtime/Utilities/AutoInvoke.h"
-

-using namespace LuaBind;

-

-static std::vector<character::Unicode>* s_Codepoints;

-

-InitializeStaticVariables([]() {

-    s_Codepoints = new std::vector<character::Unicode>();

+#include "Editor/Win/Win.h"
+
+using namespace LuaBind;
+using namespace Win;
+
+static std::vector<character::Unicode>* s_Codepoints;
+
+InitializeStaticVariables([]() {
+    s_Codepoints = new std::vector<character::Unicode>();
 });
 
 // Editor.GUI.Text(font, str, pixelSize, lineHeight, color, anchor, alignment, wordwrap, preferred, encoding)
 static int Text(lua_State* L)
 {
     LUA_BIND_STATE(L);
-

-    Font* font = (Font*)state.GetUserdata<Font>(1);

-    char* buf = (char*)state.GetValue<const char*>(2, "");

-    int pixelSize = state.GetValue<int>(3, 12);

-    int lineHeight = state.GetValue<int>(4, pixelSize + 3);

-    Color32 color = state.GetValue<Color32>(5, Color32::white);

-    int anchor = state.GetValue<int>(6, TextAnchor_UpperLeft);

-    int alignment = state.GetValue<int>(7, TextAlignment_Left);

-    bool wordwrap = state.GetValue<bool>(8, false);

-    int preferred = state.GetValue<int>(9, 0);

-    int encoding = state.GetValue<int>(10, EEncoding::Encoding_UTF8);

-

-    s_Codepoints->clear();

-    InvokeWhenLeave([]() {

-        s_Codepoints->clear();

-    });

-

-    if (encoding == EEncoding::Encoding_UTF8)

-    {

-        while (*buf != 0) {

-            int err;

-            s_Codepoints->push_back(utf8::getu8c(&buf, &err));

-            if (err != 0)

-            {

-                log_warning("Illegal utf8 bytes %d", err);

-            }

-        }

-    }

-    else if (encoding == EEncoding::Encoding_UTF16)

-    {

-        while (*buf != 0) {

-            unsigned short* s = (unsigned short*)(buf);

-            s_Codepoints->push_back(*s);

-            buf += 2;

-        }

-    }

-    else if (encoding == EEncoding::Encoding_ASCII)

-    {

-        while (*buf != 0) {

-            s_Codepoints->push_back(*buf);

-            buf += 1;

-        }

-    }

-

-    font->RenderCharacters(*s_Codepoints, pixelSize);

-

-    UnicodeString str;

-    str.str = s_Codepoints->data();

-    str.length = s_Codepoints->size();

-

-    WipeGLError();

-

-    const UITextMesh* tm = g_TextMeshGenerator.GetTextMesh(str, font, pixelSize, lineHeight, color, (ETextAnchor)anchor, (ETextAlignment)alignment, wordwrap, preferred);

-    tm->Draw();

-

+
+    Font* font = (Font*)state.GetUserdata<Font>(1);
+    char* buf = (char*)state.GetValue<const char*>(2, "");
+    int pixelSize = state.GetValue<int>(3, 12);
+    int lineHeight = state.GetValue<int>(4, pixelSize + 3);
+    Color32 color = state.GetValue<Color32>(5, Color32::white);
+    int anchor = state.GetValue<int>(6, TextAnchor_UpperLeft);
+    int alignment = state.GetValue<int>(7, TextAlignment_Left);
+    bool wordwrap = state.GetValue<bool>(8, false);
+    int preferred = state.GetValue<int>(9, 0);
+    int encoding = state.GetValue<int>(10, EEncoding::Encoding_UTF8);
+
+    s_Codepoints->clear();
+    InvokeWhenLeave([]() {
+        s_Codepoints->clear();
+    });
+
+    if (encoding == EEncoding::Encoding_UTF8)
+    {
+        while (*buf != 0) {
+            int err;
+            s_Codepoints->push_back(utf8::getu8c(&buf, &err));
+            if (err != 0)
+            {
+                log_warning("Illegal utf8 bytes %d", err);
+            }
+        }
+    }
+    else if (encoding == EEncoding::Encoding_UTF16)
+    {
+        while (*buf != 0) {
+            unsigned short* s = (unsigned short*)(buf);
+            s_Codepoints->push_back(*s);
+            buf += 2;
+        }
+    }
+    else if (encoding == EEncoding::Encoding_ASCII)
+    {
+        while (*buf != 0) {
+            s_Codepoints->push_back(*buf);
+            buf += 1;
+        }
+    }
+
+    font->RenderCharacters(*s_Codepoints, pixelSize);
+
+    UnicodeString str;
+    str.str = s_Codepoints->data();
+    str.length = s_Codepoints->size();
+
+    WipeGLError();
+
+    const UITextMesh* tm = g_TextMeshGenerator.GetTextMesh(str, font, pixelSize, lineHeight, color, (ETextAnchor)anchor, (ETextAlignment)alignment, wordwrap, preferred);
+    tm->Draw();
+
     return 0;
 }
 
+static int SetCursor(lua_State* L)
+{
+	LUA_BIND_STATE(L);
+	LUA_BIND_CHECK(state, "N");
+
+	int type = state.GetValue<int>(state, 1);
+	Win::SetCursor((ECursor)type);
+
+	return 0;
+}
+
 static luaL_Reg guiFuncs[] = {
     {"Text", Text},
+	{"SetCursor", SetCursor},
     {0, 0}
 };
 
@@ -103,13 +117,29 @@ int luaopen_GameLab_Editor_Window(lua_State* L)
     state.RegisterNativeClass<GUIWindow>();
 	state.PopNamespace();
 
-	LUA_BIND_REGISTER_ENUM(state, "EShowMode",

-		{ "NormalWindow", ContainerWindow::kShowNormalWindow },

-		{ "ShowPopupMenu", ContainerWindow::kShowPopupMenu },

-		{ "Utility ", ContainerWindow::kShowUtility },

-		{ "NoShadow", ContainerWindow::kShowNoShadow },

-		{ "MainWindow", ContainerWindow::kShowMainWindow },

-		{ "AuxWindow", ContainerWindow::kShowAuxWindow }

+	LUA_BIND_REGISTER_ENUM(state, "EShowMode",
+		{ "NormalWindow", ContainerWindow::kShowNormalWindow },
+		{ "ShowPopupMenu", ContainerWindow::kShowPopupMenu },
+		{ "Utility ", ContainerWindow::kShowUtility },
+		{ "NoShadow", ContainerWindow::kShowNoShadow },
+		{ "MainWindow", ContainerWindow::kShowMainWindow },
+		{ "AuxWindow", ContainerWindow::kShowAuxWindow }
+	);
+
+	LUA_BIND_REGISTER_ENUM(state, "ECursor",
+		{ "AppStarting", Cursor_AppStarting },
+		{ "Arrow", Cursor_Arrow },
+		{ "Cross", Cursor_Cross },
+		{ "Help", Cursor_Help },
+		{ "IBeam", Cursor_IBeam },
+		{ "NO", Cursor_NO },
+		{ "SizeAll", Cursor_SizeAll },
+		{ "SizeNESW", Cursor_SizeNESW },
+		{ "SizeNS", Cursor_SizeNS },
+		{ "SizeNWSE", Cursor_SizeNWSE },
+		{ "SizeWE", Cursor_SizeWE },
+		{ "UpArrow", Cursor_UpArrow },
+		{ "Wait", Cursor_Wait }
 	);
 
     state.RegisterMethods(guiFuncs);