[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11643] branches/soc-2007-maike/release/ glsl: GLSL generic functions bugfixes?

[Miguel Torres Lima]

Revision: 11643
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11643
Author:   maike
Date:     2007-08-17 17:13:55 +0200 (Fri, 17 Aug 2007)

Log Message:
-----------
GLSL generic functions bugfixes?

Modified Paths:
--------------
    branches/soc-2007-maike/release/glsl/material_uniforms.gsl
    branches/soc-2007-maike/release/glsl/tex_magic.gsl
    branches/soc-2007-maike/release/glsl/texture_blend_diff.gsl
    branches/soc-2007-maike/release/glsl/texture_blend_mix.gsl
    branches/soc-2007-maike/release/glsl/texture_blend_val_diff.gsl
    branches/soc-2007-maike/release/glsl/texture_blend_val_screen.gsl

Modified: branches/soc-2007-maike/release/glsl/material_uniforms.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/material_uniforms.gsl	2007-08-17 15:12:58 UTC (rev 11642)
+++ branches/soc-2007-maike/release/glsl/material_uniforms.gsl	2007-08-17 15:13:55 UTC (rev 11643)
@@ -15,6 +15,6 @@
 
 uniform float u_mat_MATERIAL_ID_amb_fac;
 uniform float u_mat_MATERIAL_ID_emit;
-uniform float u_mat_MATERIAL_ID_hard;
+uniform int u_mat_MATERIAL_ID_hard;
 
 #undef MATERIAL_ID

Modified: branches/soc-2007-maike/release/glsl/tex_magic.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/tex_magic.gsl	2007-08-17 15:12:58 UTC (rev 11642)
+++ branches/soc-2007-maike/release/glsl/tex_magic.gsl	2007-08-17 15:13:55 UTC (rev 11643)
@@ -1,9 +1,9 @@
-vec4 tex_magic(vec3 coords, vec3 colfac, float depth, float turbulence, float contrast, float brightness)
+vec4 tex_magic(vec3 coords, vec3 colfac, float depth, float turbulence, float cont, float bright)
 {
   float x, y, z;
   float turb = turbulence / 5.0;
   float i = 0.0;
-  
+
   x = sin((coords.x + coords.y + coords.z) * 5.0);
   y = cos((-coords.x + coords.y - coords.z) * 5.0);
   z = -cos((-coords.x - coords.y + coords.z) * 5.0);
@@ -62,7 +62,7 @@
     }
   }
 
-  if(turb > 0.0){
+  if(turb != 0.0){
     x = x / (turb * 2.0);
     y = y / (turb * 2.0);
     z = z / (turb * 2.0);
@@ -72,11 +72,11 @@
   y = 0.5 - y;
   z = 0.5 - z;
 
-  i = 0.3333*(x + y + z);
+  x = colfac.r * ((x - 0.5) * cont + bright - 0.5);
+  y = colfac.g * ((y - 0.5) * cont + bright - 0.5);
+  z = colfac.b * ((z - 0.5) * cont + bright - 0.5);
 
-  x = max(colfac.r * ((x - 0.5) * contrast + brightness - 0.5), 0.0);
-  y = max(colfac.g * ((y - 0.5) * contrast + brightness - 0.5), 0.0);
-  z = max(colfac.b * ((z - 0.5) * contrast + brightness - 0.5), 0.0);
+  i = clamp(0.3333 * (x + y + z), 0.0, 1.0);
 
-  return(x, y, z, i);
+  return(max(x, 0.0), max(y, 0.0), max(z, 0.0), i);
 }

Modified: branches/soc-2007-maike/release/glsl/texture_blend_diff.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/texture_blend_diff.gsl	2007-08-17 15:12:58 UTC (rev 11642)
+++ branches/soc-2007-maike/release/glsl/texture_blend_diff.gsl	2007-08-17 15:13:55 UTC (rev 11643)
@@ -4,9 +4,9 @@
   float facm = 1.0 - fact;
   vec3 color = vec3(0.0, 0.0, 0.0);
 
-  color.r = facm * col.r + fact * fabs(tex.r - col.r);
-  color.g = facm * col.g + fact * fabs(tex.g - col.g);
-  color.b = facm * col.b + fact * fabs(tex.b - col.r);
+  color.r = facm * col.r + fact * abs(tex.r - col.r);
+  color.g = facm * col.g + fact * abs(tex.g - col.g);
+  color.b = facm * col.b + fact * abs(tex.b - col.r);
 
   return(color);
 }

Modified: branches/soc-2007-maike/release/glsl/texture_blend_mix.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/texture_blend_mix.gsl	2007-08-17 15:12:58 UTC (rev 11642)
+++ branches/soc-2007-maike/release/glsl/texture_blend_mix.gsl	2007-08-17 15:13:55 UTC (rev 11643)
@@ -1,12 +1,12 @@
-vec3 tex_blend_mix(vec3 tex, vec3 col, float fac1, float fac2)
+vec3 tex_blend_mix(vec3 texcol, vec3 col, float fac1, float fac2)
 {
   float fact = fac1 * fac2;
   float facm = 1.0 - fact;
-  vec3 color = vec3(0.0, 0.0, 0.0);
+  vec3 color;
   
-  color.r = fact * tex.r + facm * col.r;
-  color.g = fact * tex.g + facm * col.g;
-  color.b = fact * tex.b + facm * col.b;
+  color.r = fact * texcol.r + facm * col.r;
+  color.g = fact * texcol.g + facm * col.g;
+  color.b = fact * texcol.b + facm * col.b;
 
   return(color);
 }

Modified: branches/soc-2007-maike/release/glsl/texture_blend_val_diff.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/texture_blend_val_diff.gsl	2007-08-17 15:12:58 UTC (rev 11642)
+++ branches/soc-2007-maike/release/glsl/texture_blend_val_diff.gsl	2007-08-17 15:13:55 UTC (rev 11643)
@@ -4,7 +4,7 @@
   float fact = fac1 * fac2;
   float facm = 1.0 - fact;
 
-  res = facm * param + fact * fabs(tex - param);
+  res = facm * param + fact * abs(tex - param);
 
   return(res);
 }

Modified: branches/soc-2007-maike/release/glsl/texture_blend_val_screen.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/texture_blend_val_screen.gsl	2007-08-17 15:12:58 UTC (rev 11642)
+++ branches/soc-2007-maike/release/glsl/texture_blend_val_screen.gsl	2007-08-17 15:13:55 UTC (rev 11643)
@@ -2,7 +2,7 @@
 {
   float res = 0.0;
   float fact = fac1 * fac2;
-  float facm = 1.0 - fac;
+  float facm = 1.0 - fac2;
 
   res = 1.0 - (facm + fact * (1.0 - tex)) * (1.0 - param);