Added shader modifications

Author: Martin Schreiber

data/shaders_glsl/shader_blinn/vertex_shader.glsl

@@ -19,8 +19,6 @@ void main(void)
 	gl_Position = pvm_matrix*vertex_position;
 
 	frag_normal3 = view_model_normal_matrix3*vertex_normal3;
-
 	frag_texture_coord2 = vertex_texture_coord2;
-
 	frag_position3 = vec3(view_model_matrix*vertex_position);
 }

data/shaders_glsl/shader_texturize_rainbowmap/fragment_shader.glsl

@@ -1,10 +1,11 @@
 #version 150
 
-in vec2 rast_texture_coord;
+in vec3 frag_vertex_normal3;
+in vec2 frag_texture_coord2;
 
 out vec3 frag_data;
 
-uniform sampler2D sampler;
+uniform sampler2D dataTexture;
 
 /**
  * computation of rainbow color map from
@@ -19,8 +20,12 @@ vec3 blend2ndOrder(vec3 f)
 
 void main(void)
 {
-	float red_value = texture(sampler, rast_texture_coord).r;
-//	red_value = rast_texture_coord.x;
+//	frag_data.xyz = vec3(0);
+//	frag_data.x = frag_texture_coord2.y;
+//	return;
+
+	float red_value = texture(dataTexture, frag_texture_coord2).r;
+//	red_value = frag_texture_coord2.x;
 
 	float limited_height = max(0.0, min(1.0, red_value));
 #if 1
@@ -32,5 +37,7 @@ void main(void)
 					vec3(3.0)*(limited_height-vec3(1.0, 0.5, 0.0))
 				);
 #endif
+//	frag_data.z = 0;
+//	frag_data.xy = frag_texture_coord2;
 	return;
 }

data/shaders_glsl/shader_texturize_rainbowmap/vertex_shader.glsl

@@ -1,15 +1,19 @@
 #version 150
 
-in vec4 vertex_position;
-in vec2 vertex_texture_coord;
+in vec4 vertex_position4;
+in vec3 vertex_normal3;
+in vec2 vertex_texture_coord2;
 
-out vec2 rast_texture_coord;
+out vec3 frag_vertex_normal3;
+out vec2 frag_texture_coord2;
 
 uniform mat4 pvm_matrix;
-uniform mat4 normal_matrix;
+//uniform mat4 normal_matrix;
 
 void main(void)
 {
-	gl_Position = pvm_matrix*vertex_position;
-	rast_texture_coord = vertex_texture_coord;
+	gl_Position = pvm_matrix*vertex_position4;
+
+	frag_vertex_normal3 = vertex_normal3;
+	frag_texture_coord2 = vertex_texture_coord2;
 }