Merged changes between 1.4.0-beta3 and 1.4.0-beta4 into dev-1_5

1 files changed, 0 insertions, 34 deletions

diff --git a/src/GLSLShaderTest/toon.frag b/src/GLSLShaderTest/toon.frag
deleted file mode 100644
index fa50453..0000000
--- a/src/GLSLShaderTest/toon.frag
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Fragment shader for cartoon-style shading
-//
-// Author: Philip Rideout
-//
-// Copyright (c) 2004 3Dlabs Inc. Ltd.
-//
-// See 3Dlabs-License.txt for license information
-//
-
-//uniform vec3 DiffuseColor;
-//uniform vec3 PhongColor;
-//uniform float Edge;
-//uniform float Phong;
-
-vec3 DiffuseColor = vec3(0.5,0.5,1.0);
-vec3 PhongColor = vec3(0.75,0.75,1.0);
-float Edge = 0.64;
-float Phong = 0.90;
-
-varying vec3 Normal;
-varying vec3 LightDir;
-
-void main (void)
-{
-	vec3 color = DiffuseColor;
-	float f = max( 0.0, dot(LightDir,Normal));
-	if (abs(f) < Edge)
-		color = DiffuseColor * 0.2;
-	if (f > Phong)
-		color = PhongColor;
-
-	gl_FragColor = vec4(color, 1);
-}