[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11290] branches/soc-2007-maike/release/ glsl: GLSL code correction for colorbands

Miguel Torres Lima torreslima at gmail.com
Mon Jul 16 19:18:37 CEST 2007


Revision: 11290
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11290
Author:   maike
Date:     2007-07-16 19:18:36 +0200 (Mon, 16 Jul 2007)

Log Message:
-----------
GLSL code correction for colorbands

Modified Paths:
--------------
    branches/soc-2007-maike/release/glsl/blinn.gsl
    branches/soc-2007-maike/release/glsl/blinn_area.gsl
    branches/soc-2007-maike/release/glsl/blinn_hemi.gsl
    branches/soc-2007-maike/release/glsl/blinn_sun.gsl
    branches/soc-2007-maike/release/glsl/cooktorr.gsl
    branches/soc-2007-maike/release/glsl/cooktorr_area.gsl
    branches/soc-2007-maike/release/glsl/cooktorr_hemi.gsl
    branches/soc-2007-maike/release/glsl/cooktorr_sun.gsl
    branches/soc-2007-maike/release/glsl/difftoon.gsl
    branches/soc-2007-maike/release/glsl/difftoon_area.gsl
    branches/soc-2007-maike/release/glsl/difftoon_hemi.gsl
    branches/soc-2007-maike/release/glsl/difftoon_sun.gsl
    branches/soc-2007-maike/release/glsl/fresnel.gsl
    branches/soc-2007-maike/release/glsl/fresnel_area.gsl
    branches/soc-2007-maike/release/glsl/fresnel_hemi.gsl
    branches/soc-2007-maike/release/glsl/fresnel_sun.gsl
    branches/soc-2007-maike/release/glsl/lambert.gsl
    branches/soc-2007-maike/release/glsl/lambert_area.gsl
    branches/soc-2007-maike/release/glsl/lambert_hemi.gsl
    branches/soc-2007-maike/release/glsl/lambert_sun.gsl
    branches/soc-2007-maike/release/glsl/light_calc.gsl
    branches/soc-2007-maike/release/glsl/minnaert.gsl
    branches/soc-2007-maike/release/glsl/minnaert_area.gsl
    branches/soc-2007-maike/release/glsl/minnaert_hemi.gsl
    branches/soc-2007-maike/release/glsl/minnaert_sun.gsl
    branches/soc-2007-maike/release/glsl/orennayar.gsl
    branches/soc-2007-maike/release/glsl/orennayar_area.gsl
    branches/soc-2007-maike/release/glsl/orennayar_hemi.gsl
    branches/soc-2007-maike/release/glsl/orennayar_sun.gsl
    branches/soc-2007-maike/release/glsl/phong.gsl
    branches/soc-2007-maike/release/glsl/phong_area.gsl
    branches/soc-2007-maike/release/glsl/phong_hemi.gsl
    branches/soc-2007-maike/release/glsl/phong_sun.gsl
    branches/soc-2007-maike/release/glsl/spectoon.gsl
    branches/soc-2007-maike/release/glsl/spectoon_area.gsl
    branches/soc-2007-maike/release/glsl/spectoon_hemi.gsl
    branches/soc-2007-maike/release/glsl/spectoon_sun.gsl
    branches/soc-2007-maike/release/glsl/wardiso.gsl
    branches/soc-2007-maike/release/glsl/wardiso_area.gsl
    branches/soc-2007-maike/release/glsl/wardiso_hemi.gsl
    branches/soc-2007-maike/release/glsl/wardiso_sun.gsl

Modified: branches/soc-2007-maike/release/glsl/blinn.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/blinn.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/blinn.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,4 +1,4 @@
-vec3 blinndef(light l, vec3 vnormal, vec3 spec_color, float spec, float hard, float refrac){
+float blinndef(light l, vec3 vnormal, float hard, float refrac){
 	vec3 view = normalize(eye - pos);
 
 	float har;
@@ -19,5 +19,5 @@
 	float p = sqrt((refrac * refrac) + (vh * vh) - 1.0);
 	float f = (((p - vh) * (p - vh)) / ((p + vh) * (p + vh))) * (1.0 + ((((vh * (p + vh)) - 1.0) * ((vh * (p + vh)) - 1.0)) / (((vh * (p - vh)) + 1.0) * ((vh * (p - vh)) + 1.0))));
 	float rslt = max(f * g * exp((-1 * (ang * ang)) / (2.0 * har * har)), 0.0);
-	return(spec * rslt * vec3(l.color + vert_color) * spec_color);
+	return(rslt);
 }

Modified: branches/soc-2007-maike/release/glsl/blinn_area.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/blinn_area.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/blinn_area.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,4 +1,4 @@
-vec3 blinnarea(light l, vec3 vnormal, vec3 spec_color, float spec, float hard, float refrac){
+float blinnarea(light l, vec3 vnormal, float hard, float refrac){
 	vec3 view = normalize(eye - pos);
 
 	float har;
@@ -19,5 +19,5 @@
 	float p = sqrt((refrac * refrac) + (vh * vh) - 1.0);
 	float f = (((p - vh) * (p - vh)) / ((p + vh) * (p + vh))) * (1.0 + ((((vh * (p + vh)) - 1.0) * ((vh * (p + vh)) - 1.0)) / (((vh * (p - vh)) + 1.0) * ((vh * (p - vh)) + 1.0))));
 	float rslt = max(f * g * exp((-1 * (ang * ang)) / (2.0 * har * har)), 0.0);
-	return(spec * rslt * vec3(l.color + vert_color) * spec_color);
+	return(rslt);
 }

Modified: branches/soc-2007-maike/release/glsl/blinn_hemi.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/blinn_hemi.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/blinn_hemi.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,4 +1,4 @@
-vec3 blinnhemi(light l, vec3 vnormal, vec3 spec_color, float spec, int hard){
+float blinnhemi(light l, vec3 vnormal, int hard){
 	vec3 view = normalize(eye - pos);
 
 	float har;
@@ -8,5 +8,5 @@
 
 	vec3 h = normalize((eye - pos) + l.vec);
 	float nh = 0.5 * dot(vnormal, h) + 0.5;
-	return(spec * nh * pow(nh, hard) * vec3(l.color + vert_color) * spec_color);
+	return(nh * pow(nh, hard));
 }

Modified: branches/soc-2007-maike/release/glsl/blinn_sun.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/blinn_sun.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/blinn_sun.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,4 +1,4 @@
-vec3 blinnsun(light l, vec3 vnormal, vec3 spec_color, float spec, float hard, float refrac){
+float blinnsun(light l, vec3 vnormal, float hard, float refrac){
 	vec3 view = normalize(eye - pos);
 
 	float har;
@@ -19,5 +19,5 @@
 	float p = sqrt((refrac * refrac) + (vh * vh) - 1.0);
 	float f = (((p - vh) * (p - vh)) / ((p + vh) * (p + vh))) * (1.0 + ((((vh * (p + vh)) - 1.0) * ((vh * (p + vh)) - 1.0)) / (((vh * (p - vh)) + 1.0) * ((vh * (p - vh)) + 1.0))));
 	float rslt = max(f * g * exp((-1 * (ang * ang)) / (2.0 * har * har)), 0.0);
-	return(spec * rslt * vec3(l.color + vert_color) * spec_color);
+	return(rslt);
 }

Modified: branches/soc-2007-maike/release/glsl/cooktorr.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/cooktorr.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/cooktorr.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,7 +1,7 @@
-vec3 cooktorrdef(light l, vec3 vnormal, vec3 spec_color, float spec, float hard, float unused){
+float cooktorrdef(light l, vec3 vnormal, float hard, float unused){
 	vec3 view = normalize(eye - pos);
 	vec3 h = normalize((eye - pos) + (l.loc - pos));
 	float nh = max(dot(vnormal, h), 0.0);
 	float nv = max(dot(vnormal, view), 0.0);
-	return((spec * pow(nh, hard) * spec_color / (0.1 + nv)) * vec3(l.color + vert_color));
+	return(pow(nh, hard) / (0.1 + nv));
 }

Modified: branches/soc-2007-maike/release/glsl/cooktorr_area.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/cooktorr_area.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/cooktorr_area.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,7 +1,7 @@
-vec3 cooktorrarea(light l, vec3 vnormal, vec3 spec_color, float spec, float hard, float unused){
+float cooktorrarea(light l, vec3 vnormal, float hard, float unused){
 	vec3 view = normalize(eye - pos);
 	vec3 h = normalize((eye - pos) + (l.loc - pos));
 	float nh = max(dot(vnormal, h), 0.0);
 	float nv = max(dot(vnormal, view), 0.0);
-	return((spec * pow(nh, hard) * spec_color / (0.1 + nv)) * vec3(l.color + vert_color));
+	return( pow(nh, hard) / (0.1 + nv));
 }

Modified: branches/soc-2007-maike/release/glsl/cooktorr_hemi.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/cooktorr_hemi.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/cooktorr_hemi.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,6 +1,6 @@
-vec3 cooktorrhemi(light l, vec3 vnormal, vec3 spec_color, float spec, float hard){
+float cooktorrhemi(light l, vec3 vnormal, float hard){
 	vec3 view = normalize(eye - pos);
 	vec3 h = normalize((eye - pos) + l.vec);
 	float nh = 0.5 * (max(dot(vnormal, h), 0.0)) + 0.5;
-	return(spec * nh * pow(nh, hard) * vec3(l.color + vert_color) * spec_color);
+	return(nh * pow(nh, hard));
 }

Modified: branches/soc-2007-maike/release/glsl/cooktorr_sun.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/cooktorr_sun.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/cooktorr_sun.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,7 +1,7 @@
-vec3 cooktorrsun(light l, vec3 vnormal, vec3 spec_color, float spec, float hard, float unused){
+float cooktorrsun(light l, vec3 vnormal, float hard, float unused){
 	vec3 view = normalize(eye - pos);
 	vec3 h = normalize((eye - pos) + l.vec);
 	float nh = max(dot(vnormal, h), 0.0);
 	float nv = max(dot(vnormal, view), 0.0);
-	return(spec * pow(nh, hard) * vec3(l.color + vert_color) * spec_color / (0.1 + nv));
+	return(pow(nh, hard) / (0.1 + nv));
 }

Modified: branches/soc-2007-maike/release/glsl/difftoon.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/difftoon.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/difftoon.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,10 +1,10 @@
-vec3 difftoondef(light l, vec3 vnormal, vec3 diff_color, float ref, float size, float smooth){
+float difftoondef(light l, vec3 vnormal, float size, float smooth){
 	vec3 lightVec = normalize(l.loc - pos);
 	float rslt = dot(vnormal, lightVec);
 	float ang;
 	ang = acos(clamp(rslt, -1.0, 1.0)) * (1 - floor(clamp(rslt, 0.1, 1.0) + 0.00001));
 
 	rslt = (1.0 - max((ang - size) / smooth, 0.0)) * ceil(clamp(size + smooth - ang, 0.0, 1.0) - 0.00001);
-	return(rslt * ref * vec3(l.color + vert_color) * diff_color);
+	return(rslt);
 }
 

Modified: branches/soc-2007-maike/release/glsl/difftoon_area.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/difftoon_area.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/difftoon_area.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,10 +1,10 @@
-vec3 difftoonarea(light l, vec3 vnormal, vec3 diff_color, float ref, float size, float smooth){
+float difftoonarea(light l, vec3 vnormal, float size, float smooth){
 	vec3 lightVec = normalize(l.loc - pos);
 	float rslt = dot(vnormal, lightVec);
 	float ang;
 	ang = acos(clamp(rslt, -1.0, 1.0)) * (1 - floor(clamp(rslt, 0.1, 1.0) + 0.00001));
 
 	rslt = (1.0 - max((ang - size) / smooth, 0.0)) * ceil(clamp(size + smooth - ang, 0.0, 1.0) - 0.00001);
-	return(rslt * ref * vec3(l.color + vert_color) * diff_color);
+	return(rslt);
 }
 

Modified: branches/soc-2007-maike/release/glsl/difftoon_hemi.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/difftoon_hemi.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/difftoon_hemi.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,4 +1,4 @@
-vec3 difftoonhemi(light l, vec3 vnormal, vec3 diff_color, float ref){
+float difftoonhemi(light l, vec3 vnormal){
 	vec3 lightVec = normalize(l.vec);
-	return((0.5 * dot(lightVec, vnormal) + 0.5) * ref * vec3(l.color + vert_color) * diff_color);
+	return(0.5 * dot(lightVec, vnormal) + 0.5);
 }

Modified: branches/soc-2007-maike/release/glsl/difftoon_sun.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/difftoon_sun.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/difftoon_sun.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,8 +1,8 @@
-vec3 difftoonsun(light l, vec3 vnormal, vec3 diff_color, float ref, float size, float smooth){
+float difftoonsun(light l, vec3 vnormal, float size, float smooth){
 	vec3 lightVec = normalize(l.vec);
 	float rslt = max(dot(vnormal, lightVec), 0.0);
 	float ang;
 	ang = acos(clamp(rslt, -1.0, 1.0)) * (1 - floor(clamp(rslt, 0.1, 1.0) + 0.00001));
 	rslt = clamp(ceil(size + smooth - ang - 0.00001) * (1.0 - ((ang - size) / smooth)), 0.0, 1.0);
-	return(rslt * ref * vec3(l.color + vert_color) * diff_color);
+	return(rslt);
 }

Modified: branches/soc-2007-maike/release/glsl/fresnel.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/fresnel.gsl	2007-07-16 12:20:57 UTC (rev 11289)
+++ branches/soc-2007-maike/release/glsl/fresnel.gsl	2007-07-16 17:18:36 UTC (rev 11290)
@@ -1,7 +1,7 @@
-vec3 fresneldef(light l, vec3 vnormal, vec3 diff_color, float ref, float grad, float fac){
+float fresneldef(light l, vec3 vnormal, float grad, float fac){

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list