aboutsummaryrefslogtreecommitdiff
path: root/src/libjin-lua/embed/scripts/graphics/graphics.lua
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-12-21 08:30:01 +0800
committerchai <chaifix@163.com>2018-12-21 08:30:01 +0800
commitc84a6761e600d4ec6ce7b921fa4b54918c7ddb25 (patch)
tree62ce188f472a48ad99c8f8ce151e126a7efe5bd3 /src/libjin-lua/embed/scripts/graphics/graphics.lua
parentceea627416494935ed2fcf14263792711e35cf8b (diff)
*misc
Diffstat (limited to 'src/libjin-lua/embed/scripts/graphics/graphics.lua')
-rw-r--r--src/libjin-lua/embed/scripts/graphics/graphics.lua28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/libjin-lua/embed/scripts/graphics/graphics.lua b/src/libjin-lua/embed/scripts/graphics/graphics.lua
index d625249..859e29b 100644
--- a/src/libjin-lua/embed/scripts/graphics/graphics.lua
+++ b/src/libjin-lua/embed/scripts/graphics/graphics.lua
@@ -89,20 +89,6 @@ local function compileBuiltInShaders()
}
#END_FRAGMENT_SHADER
]]
- jg.Shaders.Default = 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 * texel(tex, v.uv);
- }
- #END_FRAGMENT_SHADER
- ]]
jg.Shaders.Shape = jg.newShader[[
#VERTEX_SHADER
Vertex vert(Vertex v)
@@ -117,6 +103,20 @@ local function compileBuiltInShaders()
}
#END_FRAGMENT_SHADER
]]
+ jg.Shaders.Default = 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 * texel(tex, v.uv);
+ }
+ #END_FRAGMENT_SHADER
+ ]]
end
local _init = jg.init