diff options
Diffstat (limited to 'src/libjin-lua/embed/scripts')
-rw-r--r-- | src/libjin-lua/embed/scripts/app.lua | 1 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/graphics/graphics.lua | 27 |
2 files changed, 19 insertions, 9 deletions
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 |