From a6868deda1af419822d1610c0ca8b81413519393 Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 31 Oct 2018 08:33:22 +0800 Subject: =?UTF-8?q?*=E6=9B=B4=E6=96=B0=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/3rdparty/buildvm/buildvm.exe | Bin 62976 -> 62976 bytes src/3rdparty/minilua/minilua.exe | Bin 112640 -> 112640 bytes src/lua/common/je_lua_error.h | 5 +++-- src/lua/modules/graphics/je_lua_graphics.cpp | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/3rdparty/buildvm/buildvm.exe b/src/3rdparty/buildvm/buildvm.exe index 542418c..2fbe5b0 100644 Binary files a/src/3rdparty/buildvm/buildvm.exe and b/src/3rdparty/buildvm/buildvm.exe differ diff --git a/src/3rdparty/minilua/minilua.exe b/src/3rdparty/minilua/minilua.exe index 538cc53..c4a2ff5 100644 Binary files a/src/3rdparty/minilua/minilua.exe and b/src/3rdparty/minilua/minilua.exe differ diff --git a/src/lua/common/je_lua_error.h b/src/lua/common/je_lua_error.h index 500994f..3f7e76f 100644 --- a/src/lua/common/je_lua_error.h +++ b/src/lua/common/je_lua_error.h @@ -17,8 +17,9 @@ namespace JinEngine va_start(args, fmt); vsnprintf(err + strlen(err), FORMAT_MSG_BUFFER_SIZE, fmt, args); va_end(args); - luax_getglobal(L, "jin"); - luax_setfieldstring(L, "error", err); + //luax_getglobal(L, "jin"); + //luax_setfieldstring(L, "error", err); + luax_error(L, err); } } // namespace Lua diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp index 90e4533..a2157b6 100644 --- a/src/lua/modules/graphics/je_lua_graphics.cpp +++ b/src/lua/modules/graphics/je_lua_graphics.cpp @@ -196,7 +196,7 @@ namespace JinEngine AssetDatabase* fs = AssetDatabase::get(); if (!fs->exists(path)) { - error(L, "No such shader file %s\n", path); + error(L, "No such shader file \"%s\"\n", path); luax_pushnil(L); return 1; } @@ -809,4 +809,4 @@ namespace JinEngine } } // namespace Lua -} // namespace JinEngine \ No newline at end of file +} // namespace JinEngine \ No newline at end of file -- cgit v1.1-26-g67d0