Merge branch 'master' of warmcat.org:/home/git-repo/Jin

1 files changed, 43 insertions, 5 deletions

diff --git a/src/libjin-lua/scripts/graphics/graphics.lua b/src/libjin-lua/scripts/graphics/graphics.lua
index ae896d0..3abb64d 100644
--- a/src/libjin-lua/scripts/graphics/graphics.lua
+++ b/src/libjin-lua/scripts/graphics/graphics.lua
@@ -138,7 +138,21 @@ local function compileBuiltInShaders()
 			return col * texel(tex, v.uv);
 		}
 		#END_FRAGMENT_SHADER
-	]] 
+	]]
+    jg.Shaders.Error = jg.newShader[[
+    	#VERTEX_SHADER
+		Vertex vert(Vertex v)
+		{
+			return v;
+		}
+		#END_VERTEX_SHADER
+		#FRAGMENT_SHADER
+		Color frag(Color col, Texture tex, Vertex v)
+		{
+			return Color(1, 0, 1, 1);
+		}
+		#END_FRAGMENT_SHADER
+    ]]
 end
 
 local _init = jg.init
@@ -155,10 +169,6 @@ jg.init = function(setting)
     return initialized 
 end
 
-jg.unuseShader = function()
-    jg.useShader(jg.Shaders.Default)
-end
-
 -- Reset all attributes to default value.
 jg.reset = function()
     jg.setColor(255, 255, 255, 255)
@@ -167,3 +177,31 @@ jg.reset = function()
     jg.unsetFont()
     jg.unuseShader()
 end
+
+jg.unuseShader = function()
+    jg.useShader(jg.Shaders.Default)
+end
+
+local _newShader = jg.newShader
+
+jg.newShader = function(program) 
+    local shader = _newShader(program)
+    if shader == nil then 
+        jin.log.error("Compile shader failed:\n" .. debug.traceback())
+        return jg.Shaders.Error
+    else
+        return shader
+    end
+end
+
+local _newShaderf = jg.newShaderf
+
+jg.newShaderf = function(file)
+    local shader = _newShaderf(file)
+    if shader == nil then 
+        jin.log.error("Compile shader failed:\n" .. debug.traceback())
+        return jg.Shaders.Error
+    else
+        return shader
+    end
+end