aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/LuaJIT-2.0.5/src/buildvm.libbin33996 -> 33996 bytes
-rw-r--r--src/3rdparty/LuaJIT-2.0.5/src/minilua.libbin33996 -> 33996 bytes
-rw-r--r--src/libjin-lua/embed/app.lua.h332
-rw-r--r--src/libjin-lua/embed/graphics.lua.h197
-rw-r--r--src/libjin-lua/embed/scripts/app.lua1
-rw-r--r--src/libjin-lua/embed/scripts/graphics/graphics.lua27
-rw-r--r--src/libjin/graphics/shaders/je_shader.cpp94
7 files changed, 330 insertions, 321 deletions
diff --git a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib
index c7be727..d4372fd 100644
--- a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib
+++ b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib
Binary files differ
diff --git a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib
index e2b3ac3..a3cce18 100644
--- a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib
+++ b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib
Binary files differ
diff --git a/src/libjin-lua/embed/app.lua.h b/src/libjin-lua/embed/app.lua.h
index 5ece883..1f0f327 100644
--- a/src/libjin-lua/embed/app.lua.h
+++ b/src/libjin-lua/embed/app.lua.h
@@ -1,121 +1,145 @@
static unsigned char app_lua[] = {
-13,10,108,111,99,97,108,32,99,119,100,32,61,32,106,105,110,46,97,114,
-103,115,91,39,99,119,100,39,93,32,111,114,32,39,46,39,13,10,106,105,
-110,46,102,105,108,101,115,121,115,116,101,109,46,105,110,105,116,40,41,13,
-10,106,105,110,46,102,105,108,101,115,121,115,116,101,109,46,109,111,117,110,
-116,40,99,119,100,41,13,10,13,10,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,13,10,45,45,32,67,111,110,102,105,103,32,103,97,109,101,13,
-10,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+108,111,99,97,108,32,99,119,100,32,61,32,106,105,110,46,97,114,103,115,
+91,39,99,119,100,39,93,32,111,114,32,39,46,39,13,10,106,105,110,46,
+102,105,108,101,115,121,115,116,101,109,46,105,110,105,116,40,41,13,10,106,
+105,110,46,102,105,108,101,115,121,115,116,101,109,46,109,111,117,110,116,40,
+99,119,100,41,13,10,13,10,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,13,10,45,45,32,67,111,110,102,105,103,32,103,97,109,101,13,10,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,13,10,13,10,106,105,110,46,
+99,111,110,102,105,103,32,32,61,32,123,125,32,13,10,105,102,32,106,105,
+110,46,102,105,108,101,115,121,115,116,101,109,46,101,120,105,115,116,40,34,
+99,111,110,102,105,103,46,108,117,97,34,41,32,116,104,101,110,32,13,10,
+32,32,32,32,120,112,99,97,108,108,40,102,117,110,99,116,105,111,110,40,
+41,106,105,110,46,99,111,110,102,105,103,32,61,32,114,101,113,117,105,114,
+101,32,34,99,111,110,102,105,103,34,32,101,110,100,44,32,102,117,110,99,
+116,105,111,110,40,41,101,110,100,41,32,32,32,32,13,10,101,110,100,13,
+10,106,105,110,46,99,111,110,102,105,103,46,119,105,100,116,104,32,32,32,
+32,32,32,61,32,106,105,110,46,99,111,110,102,105,103,46,119,105,100,116,
+104,32,32,32,32,32,32,111,114,32,53,56,48,32,13,10,106,105,110,46,
+99,111,110,102,105,103,46,104,101,105,103,104,116,32,32,32,32,32,61,32,
+106,105,110,46,99,111,110,102,105,103,46,104,101,105,103,104,116,32,32,32,
+32,32,111,114,32,52,53,48,32,13,10,106,105,110,46,99,111,110,102,105,
+103,46,118,115,121,110,99,32,32,32,32,32,32,61,32,106,105,110,46,99,
+111,110,102,105,103,46,118,115,121,110,99,32,32,32,32,32,32,111,114,32,
+116,114,117,101,13,10,106,105,110,46,99,111,110,102,105,103,46,116,105,116,
+108,101,32,32,32,32,32,32,61,32,106,105,110,46,99,111,110,102,105,103,
+46,116,105,116,108,101,32,32,32,32,32,32,111,114,32,40,34,106,105,110,
+32,118,34,32,46,46,32,106,105,110,46,118,101,114,115,105,111,110,41,13,
+10,106,105,110,46,99,111,110,102,105,103,46,114,101,115,105,122,97,98,108,
+101,32,32,61,32,106,105,110,46,99,111,110,102,105,103,46,114,101,115,105,
+122,97,98,108,101,32,32,111,114,32,102,97,108,115,101,32,13,10,106,105,
+110,46,99,111,110,102,105,103,46,102,117,108,108,115,99,114,101,101,110,32,
+61,32,106,105,110,46,99,111,110,102,105,103,46,102,117,108,108,115,99,114,
+101,101,110,32,111,114,32,102,97,108,115,101,13,10,106,105,110,46,99,111,
+110,102,105,103,46,102,112,115,32,32,32,32,32,32,32,32,61,32,106,105,
+110,46,99,111,110,102,105,103,46,102,112,115,32,32,32,32,32,32,32,32,
+111,114,32,54,48,13,10,106,105,110,46,99,111,110,102,105,103,46,105,99,
+111,110,32,32,32,32,32,32,32,61,32,106,105,110,46,99,111,110,102,105,
+103,46,105,99,111,110,32,32,32,32,32,32,32,111,114,32,34,34,13,10,
+13,10,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,13,10,106,105,
-110,46,99,111,110,102,105,103,32,32,61,32,123,125,32,13,10,105,102,32,
-106,105,110,46,102,105,108,101,115,121,115,116,101,109,46,101,120,105,115,116,
-40,34,99,111,110,102,105,103,46,108,117,97,34,41,32,116,104,101,110,32,
-13,10,32,32,32,32,120,112,99,97,108,108,40,102,117,110,99,116,105,111,
-110,40,41,106,105,110,46,99,111,110,102,105,103,32,61,32,114,101,113,117,
-105,114,101,32,34,99,111,110,102,105,103,34,32,101,110,100,44,32,102,117,
-110,99,116,105,111,110,40,41,101,110,100,41,32,32,32,32,13,10,101,110,
-100,13,10,106,105,110,46,99,111,110,102,105,103,46,119,105,100,116,104,32,
-32,32,32,32,32,61,32,106,105,110,46,99,111,110,102,105,103,46,119,105,
-100,116,104,32,32,32,32,32,32,111,114,32,53,56,48,32,13,10,106,105,
-110,46,99,111,110,102,105,103,46,104,101,105,103,104,116,32,32,32,32,32,
-61,32,106,105,110,46,99,111,110,102,105,103,46,104,101,105,103,104,116,32,
-32,32,32,32,111,114,32,52,53,48,32,13,10,106,105,110,46,99,111,110,
-102,105,103,46,118,115,121,110,99,32,32,32,32,32,32,61,32,106,105,110,
-46,99,111,110,102,105,103,46,118,115,121,110,99,32,32,32,32,32,32,111,
-114,32,116,114,117,101,13,10,106,105,110,46,99,111,110,102,105,103,46,116,
-105,116,108,101,32,32,32,32,32,32,61,32,106,105,110,46,99,111,110,102,
-105,103,46,116,105,116,108,101,32,32,32,32,32,32,111,114,32,40,34,106,
-105,110,32,118,34,32,46,46,32,106,105,110,46,118,101,114,115,105,111,110,
-41,13,10,106,105,110,46,99,111,110,102,105,103,46,114,101,115,105,122,97,
-98,108,101,32,32,61,32,106,105,110,46,99,111,110,102,105,103,46,114,101,
-115,105,122,97,98,108,101,32,32,111,114,32,102,97,108,115,101,32,13,10,
-106,105,110,46,99,111,110,102,105,103,46,102,117,108,108,115,99,114,101,101,
-110,32,61,32,106,105,110,46,99,111,110,102,105,103,46,102,117,108,108,115,
-99,114,101,101,110,32,111,114,32,102,97,108,115,101,13,10,106,105,110,46,
-99,111,110,102,105,103,46,102,112,115,32,32,32,32,32,32,32,32,61,32,
-106,105,110,46,99,111,110,102,105,103,46,102,112,115,32,32,32,32,32,32,
-32,32,111,114,32,54,48,13,10,106,105,110,46,99,111,110,102,105,103,46,
-105,99,111,110,32,32,32,32,32,32,32,61,32,106,105,110,46,99,111,110,
-102,105,103,46,105,99,111,110,32,32,32,32,32,32,32,111,114,32,34,34,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,45,45,32,
+68,101,102,97,117,108,116,32,103,97,109,101,32,108,111,111,112,13,10,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,13,10,13,10,108,111,99,97,
+108,32,102,117,110,99,116,105,111,110,32,99,97,108,108,40,102,117,110,99,
+44,32,46,46,46,41,13,10,32,32,32,32,105,102,32,102,117,110,99,32,
+116,104,101,110,32,13,10,32,32,32,32,32,32,32,32,114,101,116,117,114,
+110,32,102,117,110,99,40,46,46,46,41,13,10,32,32,32,32,101,110,100,
+13,10,101,110,100,13,10,13,10,108,111,99,97,108,32,115,116,101,112,32,
+61,32,106,105,110,46,116,105,109,101,46,115,116,101,112,13,10,106,105,110,
+46,116,105,109,101,46,115,116,101,112,32,61,32,110,105,108,13,10,13,10,
+102,117,110,99,116,105,111,110,32,106,105,110,46,99,111,114,101,46,114,117,
+110,40,41,13,10,32,32,32,32,106,105,110,46,103,114,97,112,104,105,99,
+115,46,114,101,115,101,116,40,41,13,10,32,32,32,32,99,97,108,108,40,
+106,105,110,46,99,111,114,101,46,111,110,76,111,97,100,41,13,10,32,32,
+32,32,108,111,99,97,108,32,100,116,32,61,32,48,13,10,32,32,32,32,
+119,104,105,108,101,32,106,105,110,46,99,111,114,101,46,114,117,110,110,105,
+110,103,40,41,32,100,111,13,10,32,32,32,32,32,32,32,32,102,111,114,
+32,95,44,32,101,32,105,110,32,112,97,105,114,115,40,106,105,110,46,101,
+118,101,110,116,46,112,111,108,108,40,41,41,32,100,111,32,13,10,32,32,
+32,32,32,32,32,32,32,32,32,32,105,102,32,101,46,116,121,112,101,32,
+61,61,32,34,75,101,121,68,111,119,110,34,32,116,104,101,110,32,13,10,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,106,105,110,46,
+107,101,121,98,111,97,114,100,46,115,101,116,40,101,46,107,101,121,44,32,
+116,114,117,101,41,32,13,10,32,32,32,32,32,32,32,32,32,32,32,32,
+101,108,115,101,105,102,32,101,46,116,121,112,101,32,61,61,32,34,75,101,
+121,85,112,34,32,116,104,101,110,32,13,10,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,106,105,110,46,107,101,121,98,111,97,114,100,
+46,115,101,116,40,101,46,107,101,121,44,32,102,97,108,115,101,41,13,10,
+32,32,32,32,32,32,32,32,32,32,32,32,101,110,100,13,10,32,32,32,
+32,32,32,32,32,32,32,32,32,99,97,108,108,40,106,105,110,46,99,111,
+114,101,46,111,110,69,118,101,110,116,44,32,101,41,13,10,32,32,32,32,
+32,32,32,32,101,110,100,13,10,32,32,32,32,32,32,32,32,115,116,101,
+112,40,41,13,10,32,32,32,32,32,32,32,32,100,116,32,61,32,106,105,
+110,46,116,105,109,101,46,103,101,116,68,101,108,116,97,40,41,13,10,32,
+32,32,32,32,32,32,32,99,97,108,108,40,106,105,110,46,99,111,114,101,
+46,111,110,85,112,100,97,116,101,44,32,100,116,41,13,10,32,32,32,32,
+32,32,32,32,106,105,110,46,103,114,97,112,104,105,99,115,46,99,108,101,
+97,114,40,41,32,32,32,32,32,32,32,32,13,10,32,32,32,32,32,32,
+32,32,99,97,108,108,40,106,105,110,46,99,111,114,101,46,111,110,68,114,
+97,119,41,13,10,32,32,32,32,32,32,32,32,106,105,110,46,103,114,97,
+112,104,105,99,115,46,112,114,101,115,101,110,116,40,41,13,10,32,32,32,
+32,32,32,32,32,106,105,110,46,116,105,109,101,46,115,108,101,101,112,40,
+48,46,48,48,49,41,13,10,32,32,32,32,101,110,100,13,10,101,110,100,
13,10,13,10,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,45,
-45,32,68,101,102,97,117,108,116,32,103,97,109,101,32,108,111,111,112,13,
-10,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,13,10,108,111,
-99,97,108,32,102,117,110,99,116,105,111,110,32,99,97,108,108,40,102,117,
-110,99,44,32,46,46,46,41,13,10,32,32,32,32,105,102,32,102,117,110,
-99,32,116,104,101,110,32,13,10,32,32,32,32,32,32,32,32,114,101,116,
-117,114,110,32,102,117,110,99,40,46,46,46,41,13,10,32,32,32,32,101,
-110,100,13,10,101,110,100,13,10,13,10,108,111,99,97,108,32,115,116,101,
-112,32,61,32,106,105,110,46,116,105,109,101,46,115,116,101,112,13,10,106,
-105,110,46,116,105,109,101,46,115,116,101,112,32,61,32,110,105,108,13,10,
-13,10,102,117,110,99,116,105,111,110,32,106,105,110,46,99,111,114,101,46,
-114,117,110,40,41,13,10,32,32,32,32,106,105,110,46,103,114,97,112,104,
-105,99,115,46,114,101,115,101,116,40,41,13,10,32,32,32,32,99,97,108,
-108,40,106,105,110,46,99,111,114,101,46,111,110,76,111,97,100,41,13,10,
-32,32,32,32,108,111,99,97,108,32,100,116,32,61,32,48,13,10,32,32,
-32,32,119,104,105,108,101,32,106,105,110,46,99,111,114,101,46,114,117,110,
-110,105,110,103,40,41,32,100,111,13,10,32,32,32,32,32,32,32,32,102,
-111,114,32,95,44,32,101,32,105,110,32,112,97,105,114,115,40,106,105,110,
-46,101,118,101,110,116,46,112,111,108,108,40,41,41,32,100,111,32,13,10,
-32,32,32,32,32,32,32,32,32,32,32,32,105,102,32,101,46,116,121,112,
-101,32,61,61,32,34,75,101,121,68,111,119,110,34,32,116,104,101,110,32,
-13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,106,105,
-110,46,107,101,121,98,111,97,114,100,46,115,101,116,40,101,46,107,101,121,
-44,32,116,114,117,101,41,32,13,10,32,32,32,32,32,32,32,32,32,32,
-32,32,101,108,115,101,105,102,32,101,46,116,121,112,101,32,61,61,32,34,
-75,101,121,85,112,34,32,116,104,101,110,32,13,10,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,106,105,110,46,107,101,121,98,111,97,
-114,100,46,115,101,116,40,101,46,107,101,121,44,32,102,97,108,115,101,41,
-13,10,32,32,32,32,32,32,32,32,32,32,32,32,101,110,100,13,10,32,
-32,32,32,32,32,32,32,32,32,32,32,99,97,108,108,40,106,105,110,46,
-99,111,114,101,46,111,110,69,118,101,110,116,44,32,101,41,13,10,32,32,
-32,32,32,32,32,32,101,110,100,13,10,32,32,32,32,32,32,32,32,115,
-116,101,112,40,41,13,10,32,32,32,32,32,32,32,32,100,116,32,61,32,
-106,105,110,46,116,105,109,101,46,103,101,116,68,101,108,116,97,40,41,13,
-10,32,32,32,32,32,32,32,32,99,97,108,108,40,106,105,110,46,99,111,
-114,101,46,111,110,85,112,100,97,116,101,44,32,100,116,41,13,10,32,32,
-32,32,32,32,32,32,106,105,110,46,103,114,97,112,104,105,99,115,46,99,
-108,101,97,114,40,41,32,32,32,32,32,32,32,32,13,10,32,32,32,32,
-32,32,32,32,99,97,108,108,40,106,105,110,46,99,111,114,101,46,111,110,
-68,114,97,119,41,13,10,32,32,32,32,32,32,32,32,106,105,110,46,103,
-114,97,112,104,105,99,115,46,112,114,101,115,101,110,116,40,41,13,10,32,
+45,32,66,111,111,116,32,103,97,109,101,13,10,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,13,10,13,10,45,45,32,68,105,115,112,108,97,121,
+32,101,114,114,111,114,32,109,101,115,115,97,103,101,46,13,10,108,111,99,
+97,108,32,102,117,110,99,116,105,111,110,32,111,110,69,114,114,111,114,40,
+109,115,103,41,32,13,10,32,32,32,32,106,105,110,46,97,117,100,105,111,
+46,100,101,115,116,114,111,121,40,41,13,10,32,32,32,32,106,105,110,46,
+103,114,97,112,104,105,99,115,46,115,104,111,119,87,105,110,100,111,119,40,
+41,13,10,32,32,32,32,108,111,99,97,108,32,101,114,114,32,61,32,34,
+69,114,114,111,114,58,92,110,34,32,46,46,32,109,115,103,32,46,46,32,
+34,92,110,34,32,46,46,32,100,101,98,117,103,46,116,114,97,99,101,98,
+97,99,107,40,41,13,10,32,32,32,32,106,105,110,46,103,114,97,112,104,
+105,99,115,46,114,101,115,101,116,40,41,13,10,32,32,32,32,106,105,110,
+46,103,114,97,112,104,105,99,115,46,115,101,116,67,108,101,97,114,67,111,
+108,111,114,40,49,48,48,44,32,49,48,48,44,32,49,48,48,44,32,50,
+53,53,41,13,10,32,32,32,32,106,105,110,46,103,114,97,112,104,105,99,
+115,46,99,108,101,97,114,40,41,13,10,32,32,32,32,106,105,110,46,103,
+114,97,112,104,105,99,115,46,112,114,105,110,116,40,101,114,114,44,32,53,
+44,32,53,41,13,10,32,32,32,32,106,105,110,46,103,114,97,112,104,105,
+99,115,46,112,114,101,115,101,110,116,40,41,13,10,32,32,32,32,119,104,
+105,108,101,32,106,105,110,46,99,111,114,101,46,114,117,110,110,105,110,103,
+40,41,32,100,111,32,13,10,32,32,32,32,32,32,32,32,102,111,114,32,
+95,44,32,101,32,105,110,32,112,97,105,114,115,40,106,105,110,46,101,118,
+101,110,116,46,112,111,108,108,40,41,41,32,100,111,32,13,10,32,32,32,
+32,32,32,32,32,32,32,32,32,105,102,32,101,46,116,121,112,101,32,61,
+61,32,34,81,117,105,116,34,32,116,104,101,110,32,13,10,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,106,105,110,46,99,111,114,101,
+46,115,116,111,112,40,41,13,10,32,32,32,32,32,32,32,32,32,32,32,
+32,101,110,100,13,10,32,32,32,32,32,32,32,32,101,110,100,13,10,32,
32,32,32,32,32,32,32,106,105,110,46,116,105,109,101,46,115,108,101,101,
112,40,48,46,48,48,49,41,13,10,32,32,32,32,101,110,100,13,10,101,
-110,100,13,10,13,10,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,
-10,45,45,32,66,111,111,116,32,103,97,109,101,13,10,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,13,10,13,10,45,45,32,68,105,115,112,108,
-97,121,32,101,114,114,111,114,32,109,101,115,115,97,103,101,46,13,10,108,
-111,99,97,108,32,102,117,110,99,116,105,111,110,32,111,110,69,114,114,111,
-114,40,109,115,103,41,32,13,10,32,32,32,32,106,105,110,46,97,117,100,
-105,111,46,100,101,115,116,114,111,121,40,41,13,10,32,32,32,32,106,105,
-110,46,103,114,97,112,104,105,99,115,46,115,104,111,119,87,105,110,100,111,
-119,40,41,13,10,32,32,32,32,108,111,99,97,108,32,101,114,114,32,61,
-32,34,69,114,114,111,114,58,92,110,34,32,46,46,32,109,115,103,32,46,
-46,32,34,92,110,34,32,46,46,32,100,101,98,117,103,46,116,114,97,99,
-101,98,97,99,107,40,41,13,10,32,32,32,32,106,105,110,46,103,114,97,
-112,104,105,99,115,46,114,101,115,101,116,40,41,13,10,32,32,32,32,106,
-105,110,46,103,114,97,112,104,105,99,115,46,115,101,116,67,108,101,97,114,
-67,111,108,111,114,40,49,48,48,44,32,49,48,48,44,32,49,48,48,44,
-32,50,53,53,41,13,10,32,32,32,32,106,105,110,46,103,114,97,112,104,
-105,99,115,46,99,108,101,97,114,40,41,13,10,32,32,32,32,106,105,110,
-46,103,114,97,112,104,105,99,115,46,112,114,105,110,116,40,101,114,114,44,
-32,53,44,32,53,41,13,10,32,32,32,32,106,105,110,46,103,114,97,112,
+110,100,13,10,13,10,45,45,32,78,111,32,103,97,109,101,32,115,99,114,
+101,101,110,46,13,10,108,111,99,97,108,32,102,117,110,99,116,105,111,110,
+32,110,111,71,97,109,101,40,41,13,10,32,32,32,32,106,105,110,46,103,
+114,97,112,104,105,99,115,46,115,104,111,119,87,105,110,100,111,119,40,41,
+13,10,32,32,32,32,106,105,110,46,103,114,97,112,104,105,99,115,46,114,
+101,115,101,116,40,41,13,10,32,32,32,32,106,105,110,46,103,114,97,112,
+104,105,99,115,46,115,101,116,67,108,101,97,114,67,111,108,111,114,40,49,
+48,48,44,32,49,48,48,44,32,49,48,48,44,32,50,53,53,41,13,10,
+32,32,32,32,106,105,110,46,103,114,97,112,104,105,99,115,46,99,108,101,
+97,114,40,41,13,10,32,32,32,32,106,105,110,46,103,114,97,112,104,105,
+99,115,46,112,114,105,110,116,40,34,78,111,32,71,97,109,101,34,44,32,
+53,44,32,53,41,32,13,10,32,32,32,32,106,105,110,46,103,114,97,112,
104,105,99,115,46,112,114,101,115,101,110,116,40,41,13,10,32,32,32,32,
119,104,105,108,101,32,106,105,110,46,99,111,114,101,46,114,117,110,110,105,
110,103,40,41,32,100,111,32,13,10,32,32,32,32,32,32,32,32,102,111,
@@ -128,82 +152,58 @@ static unsigned char app_lua[] = {
32,32,32,101,110,100,13,10,32,32,32,32,32,32,32,32,101,110,100,13,
10,32,32,32,32,32,32,32,32,106,105,110,46,116,105,109,101,46,115,108,
101,101,112,40,48,46,48,48,49,41,13,10,32,32,32,32,101,110,100,13,
-10,101,110,100,13,10,13,10,45,45,32,78,111,32,103,97,109,101,32,115,
-99,114,101,101,110,46,13,10,108,111,99,97,108,32,102,117,110,99,116,105,
-111,110,32,110,111,71,97,109,101,40,41,13,10,32,32,32,32,106,105,110,
-46,103,114,97,112,104,105,99,115,46,115,104,111,119,87,105,110,100,111,119,
-40,41,13,10,32,32,32,32,106,105,110,46,103,114,97,112,104,105,99,115,
-46,114,101,115,101,116,40,41,13,10,32,32,32,32,106,105,110,46,103,114,
-97,112,104,105,99,115,46,115,101,116,67,108,101,97,114,67,111,108,111,114,
-40,49,48,48,44,32,49,48,48,44,32,49,48,48,44,32,50,53,53,41,
-13,10,32,32,32,32,106,105,110,46,103,114,97,112,104,105,99,115,46,99,
-108,101,97,114,40,41,13,10,32,32,32,32,106,105,110,46,103,114,97,112,
-104,105,99,115,46,112,114,105,110,116,40,34,78,111,32,71,97,109,101,34,
-44,32,53,44,32,53,41,32,13,10,32,32,32,32,106,105,110,46,103,114,
-97,112,104,105,99,115,46,112,114,101,115,101,110,116,40,41,13,10,32,32,
-32,32,119,104,105,108,101,32,106,105,110,46,99,111,114,101,46,114,117,110,
-110,105,110,103,40,41,32,100,111,32,13,10,32,32,32,32,32,32,32,32,
-102,111,114,32,95,44,32,101,32,105,110,32,112,97,105,114,115,40,106,105,
-110,46,101,118,101,110,116,46,112,111,108,108,40,41,41,32,100,111,32,13,
-10,32,32,32,32,32,32,32,32,32,32,32,32,105,102,32,101,46,116,121,
-112,101,32,61,61,32,34,81,117,105,116,34,32,116,104,101,110,32,13,10,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,106,105,110,46,
-99,111,114,101,46,115,116,111,112,40,41,13,10,32,32,32,32,32,32,32,
-32,32,32,32,32,101,110,100,13,10,32,32,32,32,32,32,32,32,101,110,
-100,13,10,32,32,32,32,32,32,32,32,106,105,110,46,116,105,109,101,46,
-115,108,101,101,112,40,48,46,48,48,49,41,13,10,32,32,32,32,101,110,
-100,13,10,101,110,100,13,10,13,10,108,111,99,97,108,32,102,117,110,99,
-116,105,111,110,32,98,111,111,116,40,41,32,13,10,32,32,32,32,105,102,
-32,106,105,110,46,102,105,108,101,115,121,115,116,101,109,46,101,120,105,115,
-116,40,34,109,97,105,110,46,108,117,97,34,41,32,116,104,101,110,32,13,
-10,32,32,32,32,32,32,32,32,99,97,108,108,40,102,117,110,99,116,105,
-111,110,40,41,32,13,10,32,32,32,32,32,32,32,32,32,32,32,32,114,
-101,113,117,105,114,101,34,109,97,105,110,34,32,13,10,32,32,32,32,32,
-32,32,32,32,32,32,32,106,105,110,46,99,111,114,101,46,114,117,110,40,
-41,13,10,32,32,32,32,32,32,32,32,101,110,100,41,13,10,32,32,32,
-32,101,108,115,101,13,10,32,32,32,32,32,32,32,32,110,111,71,97,109,
-101,40,41,13,10,32,32,32,32,101,110,100,13,10,101,110,100,13,10,13,
+10,101,110,100,13,10,13,10,108,111,99,97,108,32,102,117,110,99,116,105,
+111,110,32,98,111,111,116,40,41,32,13,10,32,32,32,32,105,102,32,106,
+105,110,46,102,105,108,101,115,121,115,116,101,109,46,101,120,105,115,116,40,
+34,109,97,105,110,46,108,117,97,34,41,32,116,104,101,110,32,13,10,32,
+32,32,32,32,32,32,32,99,97,108,108,40,102,117,110,99,116,105,111,110,
+40,41,32,13,10,32,32,32,32,32,32,32,32,32,32,32,32,114,101,113,
+117,105,114,101,34,109,97,105,110,34,32,13,10,32,32,32,32,32,32,32,
+32,32,32,32,32,106,105,110,46,99,111,114,101,46,114,117,110,40,41,13,
+10,32,32,32,32,32,32,32,32,101,110,100,41,13,10,32,32,32,32,101,
+108,115,101,13,10,32,32,32,32,32,32,32,32,110,111,71,97,109,101,40,
+41,13,10,32,32,32,32,101,110,100,13,10,101,110,100,13,10,13,10,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,13,10,45,45,32,73,110,105,
+116,105,97,108,105,122,101,32,115,117,98,32,115,121,115,116,101,109,115,13,
10,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,45,45,32,73,
-110,105,116,105,97,108,105,122,101,32,115,117,98,32,115,121,115,116,101,109,
-115,13,10,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,13,10,106,105,
+110,46,97,117,100,105,111,46,105,110,105,116,40,41,13,10,106,105,110,46,
+103,114,97,112,104,105,99,115,46,105,110,105,116,40,106,105,110,46,99,111,
+110,102,105,103,41,13,10,13,10,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,13,10,
-106,105,110,46,97,117,100,105,111,46,105,110,105,116,40,41,13,10,106,105,
-110,46,103,114,97,112,104,105,99,115,46,105,110,105,116,40,106,105,110,46,
-99,111,110,102,105,103,41,13,10,13,10,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,13,10,45,45,32,66,111,111,116,32,103,97,109,101,13,10,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,13,10,45,45,32,66,111,111,116,32,103,97,109,101,13,10,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,13,10,13,10,120,112,99,97,108,
+108,40,98,111,111,116,44,32,111,110,69,114,114,111,114,41,13,10,13,10,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,13,10,120,112,99,
-97,108,108,40,98,111,111,116,44,32,111,110,69,114,114,111,114,41,13,10,
-13,10,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,45,45,32,68,101,
+115,116,114,111,121,32,115,117,98,45,115,121,115,116,101,109,115,13,10,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,45,45,32,
-68,101,115,116,114,111,121,32,115,117,98,45,115,121,115,116,101,109,115,13,
-10,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,13,10,106,105,
-110,46,103,114,97,112,104,105,99,115,46,100,101,115,116,114,111,121,40,41,
-13,10,106,105,110,46,97,117,100,105,111,46,100,101,115,116,114,111,121,40,
-41,13,10,13,10,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,13,10,13,10,106,105,110,46,
+103,114,97,112,104,105,99,115,46,100,101,115,116,114,111,121,40,41,13,10,
+106,105,110,46,97,117,100,105,111,46,100,101,115,116,114,111,121,40,41,13,
+10,13,10,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,
-45,45,32,81,117,105,116,32,103,97,109,101,13,10,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,45,45,
+32,81,117,105,116,32,103,97,109,101,13,10,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,13,10,13,10,106,105,110,46,99,111,114,101,46,
-113,117,105,116,40,41,13,10
+45,45,45,45,45,13,10,13,10,106,105,110,46,99,111,114,101,46,113,117,
+105,116,40,41,13,10
};
diff --git a/src/libjin-lua/embed/graphics.lua.h b/src/libjin-lua/embed/graphics.lua.h
index 4f1c6f8..8d241de 100644
--- a/src/libjin-lua/embed/graphics.lua.h
+++ b/src/libjin-lua/embed/graphics.lua.h
@@ -21,42 +21,28 @@ static unsigned char graphics_lua[] = {
79,77,32,61,32,50,44,13,10,32,32,32,32,65,78,73,77,65,84,69,
68,32,61,32,51,13,10,125,13,10,13,10,45,45,32,66,117,105,108,116,
32,105,110,32,115,104,97,100,101,114,115,13,10,106,103,46,83,104,97,100,
-101,114,115,32,61,32,123,13,10,9,70,111,110,116,32,61,32,110,105,108,
-44,32,13,10,9,84,101,120,116,117,114,101,32,61,32,110,105,108,44,32,
-13,10,9,83,112,114,105,116,101,32,61,32,110,105,108,44,32,13,10,9,
-83,112,114,105,116,101,83,104,101,101,116,32,61,32,110,105,108,44,13,10,
-9,68,101,102,97,117,108,116,32,61,32,110,105,108,13,10,125,13,10,13,
-10,108,111,99,97,108,32,102,117,110,99,116,105,111,110,32,99,111,109,112,
-105,108,101,66,117,105,108,116,73,110,83,104,97,100,101,114,115,40,41,32,
-13,10,9,106,103,46,83,104,97,100,101,114,115,46,70,111,110,116,32,61,
-32,106,103,46,110,101,119,83,104,97,100,101,114,91,91,13,10,9,9,35,
-86,69,82,84,69,88,95,83,72,65,68,69,82,13,10,9,9,86,101,114,
-116,101,120,32,118,101,114,116,40,86,101,114,116,101,120,32,118,41,13,10,
-9,9,123,13,10,9,9,9,114,101,116,117,114,110,32,118,59,13,10,9,
-9,125,13,10,9,9,35,69,78,68,95,86,69,82,84,69,88,95,83,72,
-65,68,69,82,13,10,9,9,35,70,82,65,71,77,69,78,84,95,83,72,
-65,68,69,82,13,10,9,9,67,111,108,111,114,32,102,114,97,103,40,67,
-111,108,111,114,32,99,111,108,44,32,84,101,120,116,117,114,101,32,116,101,
-120,44,32,86,101,114,116,101,120,32,118,41,13,10,9,9,123,13,10,9,
-9,9,114,101,116,117,114,110,32,67,111,108,111,114,40,99,111,108,46,114,
-103,98,44,32,116,101,120,101,108,40,116,101,120,44,32,118,46,117,118,41,
-46,97,41,59,13,10,9,9,125,13,10,9,9,35,69,78,68,95,70,82,
-65,71,77,69,78,84,95,83,72,65,68,69,82,13,10,9,93,93,13,10,
-9,106,103,46,83,104,97,100,101,114,115,46,84,101,120,116,117,114,101,32,
-61,32,106,103,46,110,101,119,83,104,97,100,101,114,91,91,13,10,9,9,
-35,86,69,82,84,69,88,95,83,72,65,68,69,82,13,10,9,9,86,101,
-114,116,101,120,32,118,101,114,116,40,86,101,114,116,101,120,32,118,41,13,
-10,9,9,123,13,10,9,9,9,114,101,116,117,114,110,32,118,59,13,10,
-9,9,125,13,10,9,9,35,69,78,68,95,86,69,82,84,69,88,95,83,
-72,65,68,69,82,13,10,9,9,35,70,82,65,71,77,69,78,84,95,83,
-72,65,68,69,82,13,10,9,9,67,111,108,111,114,32,102,114,97,103,40,
-67,111,108,111,114,32,99,111,108,44,32,84,101,120,116,117,114,101,32,116,
-101,120,44,32,86,101,114,116,101,120,32,118,41,13,10,9,9,123,13,10,
-9,9,9,114,101,116,117,114,110,32,99,111,108,32,42,32,116,101,120,101,
-108,40,116,101,120,44,32,118,46,117,118,41,59,13,10,9,9,125,13,10,
-9,9,35,69,78,68,95,70,82,65,71,77,69,78,84,95,83,72,65,68,
-69,82,13,10,9,93,93,13,10,9,106,103,46,83,104,97,100,101,114,115,
-46,83,112,114,105,116,101,32,61,32,106,103,46,110,101,119,83,104,97,100,
+101,114,115,32,61,32,110,105,108,13,10,108,111,99,97,108,32,102,117,110,
+99,116,105,111,110,32,99,111,109,112,105,108,101,66,117,105,108,116,73,110,
+83,104,97,100,101,114,115,40,41,32,13,10,32,32,32,32,105,102,32,106,
+103,46,83,104,97,100,101,114,115,32,126,61,32,110,105,108,32,116,104,101,
+110,32,13,10,32,32,32,32,32,32,32,32,114,101,116,117,114,110,13,10,
+32,32,32,32,101,110,100,13,10,32,32,32,32,106,103,46,83,104,97,100,
+101,114,115,32,61,32,123,125,13,10,9,106,103,46,83,104,97,100,101,114,
+115,46,70,111,110,116,32,61,32,106,103,46,110,101,119,83,104,97,100,101,
+114,91,91,13,10,9,9,35,86,69,82,84,69,88,95,83,72,65,68,69,
+82,13,10,9,9,86,101,114,116,101,120,32,118,101,114,116,40,86,101,114,
+116,101,120,32,118,41,13,10,9,9,123,13,10,9,9,9,114,101,116,117,
+114,110,32,118,59,13,10,9,9,125,13,10,9,9,35,69,78,68,95,86,
+69,82,84,69,88,95,83,72,65,68,69,82,13,10,9,9,35,70,82,65,
+71,77,69,78,84,95,83,72,65,68,69,82,13,10,9,9,67,111,108,111,
+114,32,102,114,97,103,40,67,111,108,111,114,32,99,111,108,44,32,84,101,
+120,116,117,114,101,32,116,101,120,44,32,86,101,114,116,101,120,32,118,41,
+13,10,9,9,123,13,10,9,9,9,114,101,116,117,114,110,32,67,111,108,
+111,114,40,99,111,108,46,114,103,98,44,32,116,101,120,101,108,40,116,101,
+120,44,32,118,46,117,118,41,46,97,41,59,13,10,9,9,125,13,10,9,
+9,35,69,78,68,95,70,82,65,71,77,69,78,84,95,83,72,65,68,69,
+82,13,10,9,93,93,13,10,9,106,103,46,83,104,97,100,101,114,115,46,
+84,101,120,116,117,114,101,32,61,32,106,103,46,110,101,119,83,104,97,100,
101,114,91,91,13,10,9,9,35,86,69,82,84,69,88,95,83,72,65,68,
69,82,13,10,9,9,86,101,114,116,101,120,32,118,101,114,116,40,86,101,
114,116,101,120,32,118,41,13,10,9,9,123,13,10,9,9,9,114,101,116,
@@ -69,63 +55,88 @@ static unsigned char graphics_lua[] = {
108,32,42,32,116,101,120,101,108,40,116,101,120,44,32,118,46,117,118,41,
59,13,10,9,9,125,13,10,9,9,35,69,78,68,95,70,82,65,71,77,
69,78,84,95,83,72,65,68,69,82,13,10,9,93,93,13,10,9,106,103,
-46,83,104,97,100,101,114,115,46,83,112,114,105,116,101,83,104,101,101,116,
-32,61,32,106,103,46,110,101,119,83,104,97,100,101,114,91,91,13,10,9,
-9,35,86,69,82,84,69,88,95,83,72,65,68,69,82,13,10,9,9,86,
-101,114,116,101,120,32,118,101,114,116,40,86,101,114,116,101,120,32,118,41,
-13,10,9,9,123,13,10,9,9,9,114,101,116,117,114,110,32,118,59,13,
-10,9,9,125,13,10,9,9,35,69,78,68,95,86,69,82,84,69,88,95,
-83,72,65,68,69,82,13,10,9,9,35,70,82,65,71,77,69,78,84,95,
-83,72,65,68,69,82,13,10,9,9,67,111,108,111,114,32,102,114,97,103,
-40,67,111,108,111,114,32,99,111,108,44,32,84,101,120,116,117,114,101,32,
-116,101,120,44,32,86,101,114,116,101,120,32,118,41,13,10,9,9,123,13,
-10,9,9,9,114,101,116,117,114,110,32,99,111,108,32,42,32,116,101,120,
-101,108,40,116,101,120,44,32,118,46,117,118,41,59,13,10,9,9,125,13,
-10,9,9,35,69,78,68,95,70,82,65,71,77,69,78,84,95,83,72,65,
-68,69,82,13,10,9,93,93,13,10,9,106,103,46,83,104,97,100,101,114,
-115,46,68,101,102,97,117,108,116,32,61,32,106,103,46,110,101,119,83,104,
-97,100,101,114,91,91,13,10,9,9,35,86,69,82,84,69,88,95,83,72,
-65,68,69,82,13,10,9,9,86,101,114,116,101,120,32,118,101,114,116,40,
+46,83,104,97,100,101,114,115,46,83,112,114,105,116,101,32,61,32,106,103,
+46,110,101,119,83,104,97,100,101,114,91,91,13,10,9,9,35,86,69,82,
+84,69,88,95,83,72,65,68,69,82,13,10,9,9,86,101,114,116,101,120,
+32,118,101,114,116,40,86,101,114,116,101,120,32,118,41,13,10,9,9,123,
+13,10,9,9,9,114,101,116,117,114,110,32,118,59,13,10,9,9,125,13,
+10,9,9,35,69,78,68,95,86,69,82,84,69,88,95,83,72,65,68,69,
+82,13,10,9,9,35,70,82,65,71,77,69,78,84,95,83,72,65,68,69,
+82,13,10,9,9,67,111,108,111,114,32,102,114,97,103,40,67,111,108,111,
+114,32,99,111,108,44,32,84,101,120,116,117,114,101,32,116,101,120,44,32,
86,101,114,116,101,120,32,118,41,13,10,9,9,123,13,10,9,9,9,114,
-101,116,117,114,110,32,118,59,13,10,9,9,125,13,10,9,9,35,69,78,
-68,95,86,69,82,84,69,88,95,83,72,65,68,69,82,13,10,9,9,35,
-70,82,65,71,77,69,78,84,95,83,72,65,68,69,82,13,10,9,9,67,
-111,108,111,114,32,102,114,97,103,40,67,111,108,111,114,32,99,111,108,44,
-32,84,101,120,116,117,114,101,32,116,101,120,44,32,86,101,114,116,101,120,
-32,118,41,13,10,9,9,123,13,10,9,9,9,114,101,116,117,114,110,32,
-99,111,108,32,42,32,116,101,120,101,108,40,116,101,120,44,32,118,46,117,
-118,41,59,13,10,9,9,125,13,10,9,9,35,69,78,68,95,70,82,65,
-71,77,69,78,84,95,83,72,65,68,69,82,13,10,9,93,93,13,10,101,
-110,100,13,10,13,10,108,111,99,97,108,32,95,105,110,105,116,32,61,32,
-106,103,46,105,110,105,116,13,10,108,111,99,97,108,32,105,110,105,116,105,
-97,108,105,122,101,100,32,61,32,102,97,108,115,101,13,10,106,103,46,105,
-110,105,116,32,61,32,102,117,110,99,116,105,111,110,40,115,101,116,116,105,
-110,103,41,32,13,10,32,32,32,32,105,102,32,105,110,105,116,105,97,108,
-105,122,101,100,32,116,104,101,110,32,13,10,32,32,32,32,32,32,32,32,
-114,101,116,117,114,110,32,105,110,105,116,105,97,108,105,122,101,100,13,10,
-32,32,32,32,101,110,100,13,10,32,32,32,32,105,110,105,116,105,97,108,
-105,122,101,100,32,61,32,95,105,110,105,116,40,115,101,116,116,105,110,103,
-41,13,10,32,32,32,32,105,102,32,105,110,105,116,105,97,108,105,122,101,
-100,32,116,104,101,110,32,13,10,32,32,32,32,32,32,32,32,99,111,109,
-112,105,108,101,66,117,105,108,116,73,110,83,104,97,100,101,114,115,40,41,
-13,10,32,32,32,32,32,32,32,32,106,103,46,117,115,101,83,104,97,100,
-101,114,40,106,103,46,83,104,97,100,101,114,115,46,68,101,102,97,117,108,
-116,41,13,10,32,32,32,32,101,110,100,13,10,32,32,32,32,114,101,116,
-117,114,110,32,105,110,105,116,105,97,108,105,122,101,100,32,13,10,101,110,
-100,13,10,13,10,106,103,46,117,110,117,115,101,83,104,97,100,101,114,32,
-61,32,102,117,110,99,116,105,111,110,40,41,13,10,32,32,32,32,106,103,
-46,117,115,101,83,104,97,100,101,114,40,106,103,46,83,104,97,100,101,114,
-115,46,68,101,102,97,117,108,116,41,13,10,101,110,100,13,10,13,10,45,
-45,32,82,101,115,101,116,32,97,108,108,32,97,116,116,114,105,98,117,116,
-101,115,32,116,111,32,100,101,102,97,117,108,116,32,118,97,108,117,101,46,
-13,10,106,103,46,114,101,115,101,116,32,61,32,102,117,110,99,116,105,111,
-110,40,41,13,10,32,32,32,32,106,103,46,115,101,116,67,111,108,111,114,
-40,50,53,53,44,32,50,53,53,44,32,50,53,53,44,32,50,53,53,41,
-13,10,32,32,32,32,106,103,46,115,101,116,67,108,101,97,114,67,111,108,
-111,114,40,48,44,32,48,44,32,48,44,32,50,53,53,41,13,10,32,32,
-32,32,106,103,46,99,108,101,97,114,40,41,13,10,32,32,32,32,106,103,
-46,117,110,115,101,116,70,111,110,116,40,41,13,10,32,32,32,32,106,103,
-46,117,110,117,115,101,83,104,97,100,101,114,40,41,13,10,101,110,100,13,
-10
+101,116,117,114,110,32,99,111,108,32,42,32,116,101,120,101,108,40,116,101,
+120,44,32,118,46,117,118,41,59,13,10,9,9,125,13,10,9,9,35,69,
+78,68,95,70,82,65,71,77,69,78,84,95,83,72,65,68,69,82,13,10,
+9,93,93,13,10,9,106,103,46,83,104,97,100,101,114,115,46,83,112,114,
+105,116,101,83,104,101,101,116,32,61,32,106,103,46,110,101,119,83,104,97,
+100,101,114,91,91,13,10,9,9,35,86,69,82,84,69,88,95,83,72,65,
+68,69,82,13,10,9,9,86,101,114,116,101,120,32,118,101,114,116,40,86,
+101,114,116,101,120,32,118,41,13,10,9,9,123,13,10,9,9,9,114,101,
+116,117,114,110,32,118,59,13,10,9,9,125,13,10,9,9,35,69,78,68,
+95,86,69,82,84,69,88,95,83,72,65,68,69,82,13,10,9,9,35,70,
+82,65,71,77,69,78,84,95,83,72,65,68,69,82,13,10,9,9,67,111,
+108,111,114,32,102,114,97,103,40,67,111,108,111,114,32,99,111,108,44,32,
+84,101,120,116,117,114,101,32,116,101,120,44,32,86,101,114,116,101,120,32,
+118,41,13,10,9,9,123,13,10,9,9,9,114,101,116,117,114,110,32,99,
+111,108,32,42,32,116,101,120,101,108,40,116,101,120,44,32,118,46,117,118,
+41,59,13,10,9,9,125,13,10,9,9,35,69,78,68,95,70,82,65,71,
+77,69,78,84,95,83,72,65,68,69,82,13,10,9,93,93,13,10,9,106,
+103,46,83,104,97,100,101,114,115,46,68,101,102,97,117,108,116,32,61,32,
+106,103,46,110,101,119,83,104,97,100,101,114,91,91,13,10,9,9,35,86,
+69,82,84,69,88,95,83,72,65,68,69,82,13,10,9,9,86,101,114,116,
+101,120,32,118,101,114,116,40,86,101,114,116,101,120,32,118,41,13,10,9,
+9,123,13,10,9,9,9,114,101,116,117,114,110,32,118,59,13,10,9,9,
+125,13,10,9,9,35,69,78,68,95,86,69,82,84,69,88,95,83,72,65,
+68,69,82,13,10,9,9,35,70,82,65,71,77,69,78,84,95,83,72,65,
+68,69,82,13,10,9,9,67,111,108,111,114,32,102,114,97,103,40,67,111,
+108,111,114,32,99,111,108,44,32,84,101,120,116,117,114,101,32,116,101,120,
+44,32,86,101,114,116,101,120,32,118,41,13,10,9,9,123,13,10,9,9,
+9,114,101,116,117,114,110,32,99,111,108,32,42,32,116,101,120,101,108,40,
+116,101,120,44,32,118,46,117,118,41,59,13,10,9,9,125,13,10,9,9,
+35,69,78,68,95,70,82,65,71,77,69,78,84,95,83,72,65,68,69,82,
+13,10,9,93,93,13,10,32,32,32,32,106,103,46,83,104,97,100,101,114,
+115,46,83,104,97,112,101,32,61,32,106,103,46,110,101,119,83,104,97,100,
+101,114,91,91,13,10,32,32,32,32,35,86,69,82,84,69,88,95,83,72,
+65,68,69,82,13,10,9,86,101,114,116,101,120,32,118,101,114,116,40,86,
+101,114,116,101,120,32,118,41,13,10,9,123,13,10,9,9,114,101,116,117,
+114,110,32,118,59,13,10,9,125,13,10,9,35,69,78,68,95,86,69,82,
+84,69,88,95,83,72,65,68,69,82,13,10,9,35,70,82,65,71,77,69,
+78,84,95,83,72,65,68,69,82,13,10,9,67,111,108,111,114,32,102,114,
+97,103,40,67,111,108,111,114,32,99,111,108,44,32,84,101,120,116,117,114,
+101,32,116,101,120,44,32,86,101,114,116,101,120,32,118,41,13,10,9,123,
+13,10,9,9,114,101,116,117,114,110,32,99,111,108,59,13,10,9,125,13,
+10,9,35,69,78,68,95,70,82,65,71,77,69,78,84,95,83,72,65,68,
+69,82,13,10,32,32,32,32,93,93,13,10,101,110,100,13,10,13,10,108,
+111,99,97,108,32,95,105,110,105,116,32,61,32,106,103,46,105,110,105,116,
+13,10,108,111,99,97,108,32,105,110,105,116,105,97,108,105,122,101,100,32,
+61,32,102,97,108,115,101,13,10,106,103,46,105,110,105,116,32,61,32,102,
+117,110,99,116,105,111,110,40,115,101,116,116,105,110,103,41,32,13,10,32,
+32,32,32,105,102,32,105,110,105,116,105,97,108,105,122,101,100,32,116,104,
+101,110,32,13,10,32,32,32,32,32,32,32,32,114,101,116,117,114,110,32,
+105,110,105,116,105,97,108,105,122,101,100,13,10,32,32,32,32,101,110,100,
+13,10,32,32,32,32,105,110,105,116,105,97,108,105,122,101,100,32,61,32,
+95,105,110,105,116,40,115,101,116,116,105,110,103,41,13,10,32,32,32,32,
+105,102,32,105,110,105,116,105,97,108,105,122,101,100,32,116,104,101,110,32,
+13,10,32,32,32,32,32,32,32,32,99,111,109,112,105,108,101,66,117,105,
+108,116,73,110,83,104,97,100,101,114,115,40,41,13,10,32,32,32,32,32,
+32,32,32,106,103,46,117,115,101,83,104,97,100,101,114,40,106,103,46,83,
+104,97,100,101,114,115,46,68,101,102,97,117,108,116,41,13,10,32,32,32,
+32,101,110,100,13,10,32,32,32,32,114,101,116,117,114,110,32,105,110,105,
+116,105,97,108,105,122,101,100,32,13,10,101,110,100,13,10,13,10,106,103,
+46,117,110,117,115,101,83,104,97,100,101,114,32,61,32,102,117,110,99,116,
+105,111,110,40,41,13,10,32,32,32,32,106,103,46,117,115,101,83,104,97,
+100,101,114,40,106,103,46,83,104,97,100,101,114,115,46,68,101,102,97,117,
+108,116,41,13,10,101,110,100,13,10,13,10,45,45,32,82,101,115,101,116,
+32,97,108,108,32,97,116,116,114,105,98,117,116,101,115,32,116,111,32,100,
+101,102,97,117,108,116,32,118,97,108,117,101,46,13,10,106,103,46,114,101,
+115,101,116,32,61,32,102,117,110,99,116,105,111,110,40,41,13,10,32,32,
+32,32,106,103,46,115,101,116,67,111,108,111,114,40,50,53,53,44,32,50,
+53,53,44,32,50,53,53,44,32,50,53,53,41,13,10,32,32,32,32,106,
+103,46,115,101,116,67,108,101,97,114,67,111,108,111,114,40,48,44,32,48,
+44,32,48,44,32,50,53,53,41,13,10,32,32,32,32,106,103,46,99,108,
+101,97,114,40,41,13,10,32,32,32,32,106,103,46,117,110,115,101,116,70,
+111,110,116,40,41,13,10,32,32,32,32,106,103,46,117,110,117,115,101,83,
+104,97,100,101,114,40,41,13,10,101,110,100,13,10
};
diff --git a/src/libjin-lua/embed/scripts/app.lua b/src/libjin-lua/embed/scripts/app.lua
index 51a6bcc..1ba5402 100644
--- a/src/libjin-lua/embed/scripts/app.lua
+++ b/src/libjin-lua/embed/scripts/app.lua
@@ -1,4 +1,3 @@
-
local cwd = jin.args['cwd'] or '.'
jin.filesystem.init()
jin.filesystem.mount(cwd)
diff --git a/src/libjin-lua/embed/scripts/graphics/graphics.lua b/src/libjin-lua/embed/scripts/graphics/graphics.lua
index ffa84db..d625249 100644
--- a/src/libjin-lua/embed/scripts/graphics/graphics.lua
+++ b/src/libjin-lua/embed/scripts/graphics/graphics.lua
@@ -27,15 +27,12 @@ jg.SpriteMode = {
}
-- Built in shaders
-jg.Shaders = {
- Font = nil,
- Texture = nil,
- Sprite = nil,
- SpriteSheet = nil,
- Default = nil
-}
-
+jg.Shaders = nil
local function compileBuiltInShaders()
+ if jg.Shaders ~= nil then
+ return
+ end
+ jg.Shaders = {}
jg.Shaders.Font = jg.newShader[[
#VERTEX_SHADER
Vertex vert(Vertex v)
@@ -106,6 +103,20 @@ local function compileBuiltInShaders()
}
#END_FRAGMENT_SHADER
]]
+ jg.Shaders.Shape = jg.newShader[[
+ #VERTEX_SHADER
+ Vertex vert(Vertex v)
+ {
+ return v;
+ }
+ #END_VERTEX_SHADER
+ #FRAGMENT_SHADER
+ Color frag(Color col, Texture tex, Vertex v)
+ {
+ return col;
+ }
+ #END_FRAGMENT_SHADER
+ ]]
end
local _init = jg.init
diff --git a/src/libjin/graphics/shaders/je_shader.cpp b/src/libjin/graphics/shaders/je_shader.cpp
index 8fbb133..f752e99 100644
--- a/src/libjin/graphics/shaders/je_shader.cpp
+++ b/src/libjin/graphics/shaders/je_shader.cpp
@@ -27,52 +27,40 @@ namespace JinEngine
// SHADER_FORMAT_SIZE
// formatShader
//
-#include "built-in/je_default.shader.h"
+ #include "built-in/je_default.shader.h"
-//
-// https://stackoverflow.com/questions/27941496/use-sampler-without-passing-through-value
-// The default value of a sampler variable is 0. From the GLSL 3.30 spec,
-// section "4.3.5 Uniforms":
-//
-// The link time initial value is either the value of the variable's
-// initializer, if present, or 0 if no initializer is present.Sampler
-// types cannot have initializers.
-//
-// Since a value of 0 means that it's sampling from texture unit 0, it will
-// work without ever setting the value as long as you bind your textures to
-// unit 0. This is well defined behavior.
-//
-// Since texture unit 0 is also the default until you call glActiveTexture()
-// with a value other than GL_TEXTURE0, it's very common to always use unit
-// 0 as long as shaders do not need more than one texture.Which means that
-// often times, setting the sampler uniforms is redundant for simple
-// applications.
-//
-// I would still prefer to always set the values.If nothing else, it makes
-// it clear to anybody reading your code that you really mean to sample from
-// texture unit 0, and did not just forget to set the value.
-//
+ //
+ // https://stackoverflow.com/questions/27941496/use-sampler-without-passing-through-value
+ // The default value of a sampler variable is 0. From the GLSL 3.30 spec,
+ // section "4.3.5 Uniforms":
+ //
+ // The link time initial value is either the value of the variable's
+ // initializer, if present, or 0 if no initializer is present.Sampler
+ // types cannot have initializers.
+ //
+ // Since a value of 0 means that it's sampling from texture unit 0, it will
+ // work without ever setting the value as long as you bind your textures to
+ // unit 0. This is well defined behavior.
+ //
+ // Since texture unit 0 is also the default until you call glActiveTexture()
+ // with a value other than GL_TEXTURE0, it's very common to always use unit
+ // 0 as long as shaders do not need more than one texture.Which means that
+ // often times, setting the sampler uniforms is redundant for simple
+ // applications.
+ //
+ // I would still prefer to always set the values.If nothing else, it makes
+ // it clear to anybody reading your code that you really mean to sample from
+ // texture unit 0, and did not just forget to set the value.
+ //
const int DEFAULT_TEXTURE_UNIT = 0;
-/*
- Shader* Shader::createShader(const string& program)
- {
- Shader* shader = nullptr;
- try
- {
- shader = new Shader(program);
- }
- catch (...)
- {
- return nullptr;
- }
- return shader;
- }
-*/
+
Shader::Shader(const string& program)
: mCurrentTextureUnit(DEFAULT_TEXTURE_UNIT)
{
if (!compile(program))
+ {
throw 0;
+ }
}
Shader::~Shader()
@@ -97,23 +85,23 @@ namespace JinEngine
{
return false;
}
-#define glsl(SHADER_MODE, SHADER, SRC) \
-do{ \
-const GLchar* src = SRC.c_str(); \
-glShaderSource(SHADER, 1, &src, NULL); \
-glCompileShader(SHADER); \
-GLint success; \
-glGetShaderiv(SHADER, GL_COMPILE_STATUS, &success); \
-if (success == GL_FALSE) \
- return false; \
-}while(0)
+ #define glsl(SHADER_MODE, SHADER, SRC) \
+ do{ \
+ const GLchar* src = SRC.c_str(); \
+ glShaderSource(SHADER, 1, &src, NULL); \
+ glCompileShader(SHADER); \
+ GLint success; \
+ glGetShaderiv(SHADER, GL_COMPILE_STATUS, &success); \
+ if (success == GL_FALSE) \
+ return false; \
+ }while(0)
// Compile vertex shader.
GLuint vid = glCreateShader(GL_VERTEX_SHADER);
glsl(GL_VERTEX_SHADER, vid, vertex_shader);
// Compile fragment shader.
GLuint fid = glCreateShader(GL_FRAGMENT_SHADER);
glsl(GL_FRAGMENT_SHADER, fid, fragment_shader);
-#undef glsl
+ #undef glsl
// Create OpenGL shader program.
mPID = glCreateProgram();
glAttachShader(mPID, vid);
@@ -144,9 +132,9 @@ if (success == GL_FALSE) \
return mCurrentTextureUnit;
}
-#define checkJSL() \
- if (gl.getShader() != this) \
- return
+ #define checkJSL() \
+ if (gl.getShader() != this) \
+ return
void Shader::sendInt(const char* name, int value)
{
generated by cgit v1.1-26-g67d0 at 2025-05-20 18:56:03 +0000