From 0944b2f95b9971d62f35b9dcc38d28a27e278249 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 20 Nov 2021 20:29:08 +0800 Subject: * mv gui to editor --- Runtime/Scripting/GL/GL.bind.cpp | 6 +++--- Runtime/Scripting/RuntimeScriptGlobals.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Runtime/Scripting') diff --git a/Runtime/Scripting/GL/GL.bind.cpp b/Runtime/Scripting/GL/GL.bind.cpp index caf3877..5260378 100644 --- a/Runtime/Scripting/GL/GL.bind.cpp +++ b/Runtime/Scripting/GL/GL.bind.cpp @@ -180,12 +180,12 @@ int Viewport(lua_State* L) { LUA_BIND_STATE(L); - float left = state.GetValue(1, 0); - float right = state.GetValue(2, 0); + float x = state.GetValue(1, 0); + float y = state.GetValue(2, 0); float width = state.GetValue(3, 0); float height = state.GetValue(4, 0); - glViewport(left, right, width, height); + glViewport(x, y, width, height); return 0; } diff --git a/Runtime/Scripting/RuntimeScriptGlobals.cpp b/Runtime/Scripting/RuntimeScriptGlobals.cpp index bb3139c..76de265 100644 --- a/Runtime/Scripting/RuntimeScriptGlobals.cpp +++ b/Runtime/Scripting/RuntimeScriptGlobals.cpp @@ -7,9 +7,9 @@ namespace Scripting { globals.setCurrentEvent = "GameLab.Events.Event.SetCurrentEvent"; - globals.guiBeginFrame = "GameLab.Engine.GUI.BeginFrame"; - globals.guiEndFrame = "GameLab.Engine.GUI.EndFrame"; - globals.guiBeginOnGUI = "GameLab.Engine.GUI.BeginOnGUI"; - globals.guiEndOnGUI = "GameLab.Engine.GUI.EndOnGUI"; + globals.guiBeginFrame = "GameLab.Editor.GUI.BeginFrame"; + globals.guiEndFrame = "GameLab.Editor.GUI.EndFrame"; + globals.guiBeginOnGUI = "GameLab.Editor.GUI.BeginOnGUI"; + globals.guiEndOnGUI = "GameLab.Editor.GUI.EndOnGUI"; } } \ No newline at end of file -- cgit v1.1-26-g67d0