[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13192] trunk/blender/source/blender: Adding the colorband Hue, Saturation, Value, Color blending modes

[Ton Roosendaal]

Revision: 13192
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13192
Author:   ton
Date:     2008-01-10 12:26:17 +0100 (Thu, 10 Jan 2008)

Log Message:
-----------
Adding the colorband Hue, Saturation, Value, Color blending modes 
to the Material Texture blending as well.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_texture_types.h
    trunk/blender/source/blender/render/intern/source/texture.c
    trunk/blender/source/blender/src/buttons_shading.c

Modified: trunk/blender/source/blender/makesdna/DNA_texture_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_texture_types.h	2008-01-10 05:30:55 UTC (rev 13191)
+++ trunk/blender/source/blender/makesdna/DNA_texture_types.h	2008-01-10 11:26:17 UTC (rev 13192)
@@ -365,6 +365,10 @@
 #define MTEX_LIGHT		7
 #define MTEX_SCREEN		8
 #define MTEX_OVERLAY	9
+#define MTEX_BLEND_HUE		10
+#define MTEX_BLEND_SAT		11
+#define MTEX_BLEND_VAL		12
+#define MTEX_BLEND_COLOR	13
 
 /* **************** EnvMap ********************* */
 

Modified: trunk/blender/source/blender/render/intern/source/texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/texture.c	2008-01-10 05:30:55 UTC (rev 13191)
+++ trunk/blender/source/blender/render/intern/source/texture.c	2008-01-10 11:26:17 UTC (rev 13192)
@@ -53,6 +53,7 @@
 
 #include "BKE_global.h"
 #include "BKE_main.h"
+#include "BKE_material.h"
 
 #include "BKE_library.h"
 #include "BKE_image.h"
@@ -1255,7 +1256,7 @@
 		in[1]= (fact*tex[1] + facm*out[1]);
 		in[2]= (fact*tex[2] + facm*out[2]);
 		break;
-
+		
 	case MTEX_MUL:
 		fact*= facg;
 		facm= 1.0-facg;
@@ -1343,9 +1344,28 @@
 		col= fact*tex[2];
 		if(col > out[2]) in[2]= col; else in[2]= out[2];
 		break;
+		
+	case MTEX_BLEND_HUE:
+		fact*= facg;
+		VECCOPY(in, out);
+		ramp_blend(MA_RAMP_HUE, in, in+1, in+2, fact, tex);
+		break;
+	case MTEX_BLEND_SAT:
+		fact*= facg;
+		VECCOPY(in, out);
+		ramp_blend(MA_RAMP_SAT, in, in+1, in+2, fact, tex);
+		break;
+	case MTEX_BLEND_VAL:
+		fact*= facg;
+		VECCOPY(in, out);
+		ramp_blend(MA_RAMP_VAL, in, in+1, in+2, fact, tex);
+		break;
+	case MTEX_BLEND_COLOR:
+		fact*= facg;
+		VECCOPY(in, out);
+		ramp_blend(MA_RAMP_COLOR, in, in+1, in+2, fact, tex);
+		break;
 	}
-
-
 }
 
 float texture_value_blend(float tex, float out, float fact, float facg, int blendtype, int flip)

Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c	2008-01-10 05:30:55 UTC (rev 13191)
+++ trunk/blender/source/blender/src/buttons_shading.c	2008-01-10 11:26:17 UTC (rev 13192)
@@ -142,6 +142,11 @@
 	str += sprintf(str, formatstr, "Darken", MTEX_DARK);
 	str += sprintf(str, formatstr, "Lighten", MTEX_LIGHT);
 
+	str += sprintf(str, formatstr, "Hue", MTEX_BLEND_HUE);
+	str += sprintf(str, formatstr, "Saturation", MTEX_BLEND_SAT);
+	str += sprintf(str, formatstr, "Value", MTEX_BLEND_VAL);
+	str += sprintf(str, formatstr, "Color", MTEX_BLEND_COLOR);
+	
 	return string;
 }