From c734eb129d24a5ed6dcad8fa8fd1bdb3352f1257 Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 31 Oct 2018 20:44:20 +0800 Subject: =?UTF-8?q?*=E6=9B=B4=E6=96=B0=E6=B8=B2=E6=9F=93=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lua/embed/graphics.lua.h | 2 +- src/lua/modules/graphics/je_lua_graphics.cpp | 4 ++-- src/lua/modules/mouse/je_lua_mouse.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lua') diff --git a/src/lua/embed/graphics.lua.h b/src/lua/embed/graphics.lua.h index b2a19b5..671cacd 100644 --- a/src/lua/embed/graphics.lua.h +++ b/src/lua/embed/graphics.lua.h @@ -17,7 +17,7 @@ Vertex vert(Vertex v) Color frag(Color col, Texture tex, Vertex v) { - return col * texel(tex, v.uv); + return col; } #END_FRAGMENT_SHADER diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp index a2157b6..6324e00 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\"", path); luax_pushnil(L); return 1; } @@ -623,7 +623,7 @@ namespace JinEngine AssetDatabase* fs = AssetDatabase::get(); if (!fs->exists(path)) { - error(L, "No such font %s\n", path); + error(L, "No such font \"%s\"", path); luax_pushnil(L); return 1; } diff --git a/src/lua/modules/mouse/je_lua_mouse.cpp b/src/lua/modules/mouse/je_lua_mouse.cpp index 88638d2..d6c84e7 100644 --- a/src/lua/modules/mouse/je_lua_mouse.cpp +++ b/src/lua/modules/mouse/je_lua_mouse.cpp @@ -28,9 +28,9 @@ namespace JinEngine } LUA_IMPLEMENT const luaL_Reg f[] = { - { "position", l_pos }, - { "setVisible", l_setVisible }, - { 0, 0 } + { "getPosition", l_pos }, + { "setVisible", l_setVisible }, + { 0, 0 } }; LUA_EXPORT int luaopen_mouse(lua_State* L) -- cgit v1.1-26-g67d0