aboutsummaryrefslogtreecommitdiff
path: root/src/libjin-lua/embed/scripts/graphics/graphics.lua
diff options
context:
space:
mode:
Diffstat (limited to 'src/libjin-lua/embed/scripts/graphics/graphics.lua')
-rw-r--r--src/libjin-lua/embed/scripts/graphics/graphics.lua21
1 files changed, 18 insertions, 3 deletions
diff --git a/src/libjin-lua/embed/scripts/graphics/graphics.lua b/src/libjin-lua/embed/scripts/graphics/graphics.lua
index a0efe03..8b16a35 100644
--- a/src/libjin-lua/embed/scripts/graphics/graphics.lua
+++ b/src/libjin-lua/embed/scripts/graphics/graphics.lua
@@ -103,6 +103,21 @@ local function compileBuiltInShaders()
}
#END_FRAGMENT_SHADER
]]
+ jg.Shaders.Mesh = jg.newShader[[
+ #VERTEX_SHADER
+ in Vec4 color;
+ Vertex vert(Vertex v)
+ {
+ return v;
+ }
+ #END_VERTEX_SHADER
+ #FRAGMENT_SHADER
+ Color frag(Color col, Texture tex, Vertex v)
+ {
+ return col * texel(tex, v.uv) * v.color;
+ }
+ #END_FRAGMENT_SHADER
+ ]]
jg.Shaders.Default = jg.newShader[[
#VERTEX_SHADER
Vertex vert(Vertex v)
@@ -116,7 +131,7 @@ local function compileBuiltInShaders()
return col * texel(tex, v.uv);
}
#END_FRAGMENT_SHADER
- ]]
+ ]]
end
local _init = jg.init
@@ -128,13 +143,13 @@ jg.init = function(setting)
initialized = _init(setting)
if initialized then
compileBuiltInShaders()
- jg.useShader(jg.Shaders.Font)
+ jg.useShader(jg.Shaders.Default)
end
return initialized
end
jg.unuseShader = function()
- jg.useShader(jg.Shaders.Font)
+ jg.useShader(jg.Shaders.Default)
end
-- Reset all attributes to default value.