From d0ca6e68602dc691fb8754e3ccdba705c41ca560 Mon Sep 17 00:00:00 2001
From: Massimiliano Corsini maxcorsini <massimiliano.corsini@isti.cnr.it>
Date: Tue, 10 Oct 2006 10:55:16 +0000
Subject: [PATCH] *** empty log message ***

---
 src/meshlab/shaders/phong.frag | 5 +++--
 src/meshlab/shaders/phong.vert | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/meshlab/shaders/phong.frag b/src/meshlab/shaders/phong.frag
index 1e27cd551..3a2b4666a 100644
--- a/src/meshlab/shaders/phong.frag
+++ b/src/meshlab/shaders/phong.frag
@@ -6,10 +6,11 @@
 // Visual Computing Lab (2006)
 //
 
-
 varying vec3 normal;
 varying vec3 vpos;
 
+uniform float shininess;
+
 void main()
 {
 	vec3 n = normalize(normal);
@@ -38,7 +39,7 @@ void main()
 	float RdotV = dot(rVector, viewVector);
 	
 	if (RdotV > 0.0)
-		specular = ks * pow(RdotV, gl_FrontMaterial.shininess);
+		specular = ks * pow(RdotV, shininess);
 
 	gl_FragColor = ambient + diffuse + specular;
 } 
diff --git a/src/meshlab/shaders/phong.vert b/src/meshlab/shaders/phong.vert
index a0c6e808d..bfe280426 100644
--- a/src/meshlab/shaders/phong.vert
+++ b/src/meshlab/shaders/phong.vert
@@ -11,10 +11,6 @@ varying vec3 vpos;
 
 void main()
 {	
-	vec3 n, lightDir, rVector;
-	vec4 diffuse = {0.0};
-	vec4 specular = {0.0};
-
 	// vertex normal
 	normal = normalize(gl_NormalMatrix * gl_Normal);