aboutsummaryrefslogtreecommitdiff
path: root/src/lua
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-11-01 08:40:29 +0800
committerchai <chaifix@163.com>2018-11-01 08:40:29 +0800
commit2a8b975d44661db15a566a57e7d6fbe428082aef (patch)
tree682e156af77d887bd8d6454d6d9624521d4b958a /src/lua
parentdde69cd088da0ae6f4a386ef952c3d8775bd6298 (diff)
*更新流程
Diffstat (limited to 'src/lua')
-rw-r--r--src/lua/embed/embed.h12
-rw-r--r--src/lua/embed/graphics.lua.h2
-rw-r--r--src/lua/jin.cpp2
3 files changed, 7 insertions, 9 deletions
diff --git a/src/lua/embed/embed.h b/src/lua/embed/embed.h
index e343dcd..1efbc95 100644
--- a/src/lua/embed/embed.h
+++ b/src/lua/embed/embed.h
@@ -4,28 +4,26 @@
namespace JinEngine
{
- namespace embed
+ namespace Embed
{
#define embed(L, script, name)\
if(luax_loadbuffer(L, script, strlen(script), name) == 0)\
lua_call(L, 0, 0);
- /**
- * embed structure.
- */
+ // Embed structure.
struct jin_Embed
{
const char* file, *source;
};
- // embed scripts
+ // Embed scripts.
#include "graphics.lua.h"
#include "keyboard.lua.h"
#include "mouse.lua.h"
#include "boot.lua.h"
- // in order
+ // In order.
const jin_Embed scripts[] = {
{ "graphics.lua", graphics_lua },
{ "keyboard.lua", keyboard_lua },
@@ -40,7 +38,7 @@ namespace JinEngine
embed(L, scripts[i].source, scripts[i].file);
}
- } // embed
+ } // namespace Embed
} // namespace JinEngine
#endif \ No newline at end of file
diff --git a/src/lua/embed/graphics.lua.h b/src/lua/embed/graphics.lua.h
index 671cacd..b2a19b5 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;
+ return col * texel(tex, v.uv);
}
#END_FRAGMENT_SHADER
diff --git a/src/lua/jin.cpp b/src/lua/jin.cpp
index 10b60b6..26b5f04 100644
--- a/src/lua/jin.cpp
+++ b/src/lua/jin.cpp
@@ -104,7 +104,7 @@ namespace JinEngine
LUA_EXPORT void boot(lua_State* L)
{
- JinEngine::embed::boot(L);
+ JinEngine::Embed::boot(L);
}
} // namespace Lua