From a84ba9c853f972f8e666b17f3e0f875b7282e6c1 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 14 Oct 2014 01:01:25 -0300 Subject: Collada -=-=-=- -Fixed some DAE import & export bugs -Changed Collada exporter to use the mesh loops API -Added tangent export to Collada exporter -Added triangulation option to Collada exporter -Changed a little how normalmaps are handled in shader. Not sure if it's working properly, be careful. -Fixed some strange bug with kinematic bodies #776 -Fix release compilaiton issues #782 --- drivers/gles2/shaders/material.glsl | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'drivers/gles2/shaders') diff --git a/drivers/gles2/shaders/material.glsl b/drivers/gles2/shaders/material.glsl index 63ff4a5f47..bf82822378 100644 --- a/drivers/gles2/shaders/material.glsl +++ b/drivers/gles2/shaders/material.glsl @@ -819,6 +819,10 @@ void main() { vec4 color = color_interp; #endif +#if defined(ENABLE_NORMALMAP) + + vec3 normalmap = vec3(0.0); +#endif @@ -833,6 +837,11 @@ FRAGMENT_SHADER_CODE } +#if defined(ENABLE_NORMALMAP) + + normal = normalize( tangent_interp * normalmap.x + binormal_interp * normalmap.y + normal_interp * normalmap.z ) * side; +#endif + #if defined(ENABLE_DISCARD) if (discard_) { //easy to eliminate dead code -- cgit v1.2.3