[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15246] trunk/blender/source/blender: * Simple addition to math node (comp and shading): Greater Than and Less Than modes.

[Matt Ebb]

Revision: 15246
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15246
Author:   broken
Date:     2008-06-17 06:18:34 +0200 (Tue, 17 Jun 2008)

Log Message:
-----------
* Simple addition to math node (comp and shading): Greater Than and Less Than modes.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_math.c
    trunk/blender/source/blender/src/drawnode.c

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c	2008-06-16 19:54:43 UTC (rev 15245)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c	2008-06-17 04:18:34 UTC (rev 15246)
@@ -131,7 +131,23 @@
 		{
 				out[0]= (int)(in[0] + 0.5f);
 		}
-		break; 
+		break;
+	case 15: /* Less Than */
+		{
+			if( in[0] < in2[0] )
+				out[0]= 1.0f;
+			else
+				out[0]= 0.0f;
+		}
+		break;
+	case 16: /* Greater Than */
+		{
+			if( in[0] > in2[0] )
+				out[0]= 1.0f;
+			else
+				out[0]= 0.0f;
+		}
+		break;
 	}
 }
 

Modified: trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_math.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_math.c	2008-06-16 19:54:43 UTC (rev 15245)
+++ trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_math.c	2008-06-17 04:18:34 UTC (rev 15246)
@@ -174,7 +174,23 @@
 			else
 				out[0]->vec[0]= (int)(in[1]->vec[0] + 0.5f);
 		}
-		break; 
+		break;
+	case 15: /* Less Than */
+		{
+			if( in[0]->vec[0] < in[1]->vec[0] )
+				out[0]->vec[0]= 1.0f;
+			else
+				out[0]->vec[0]= 0.0f;
+		}
+		break;
+	case 16: /* Greater Than */
+		{
+			if( in[0]->vec[0] > in[1]->vec[0] )
+				out[0]->vec[0]= 1.0f;
+			else
+				out[0]->vec[0]= 0.0f;
+		}
+		break;
 	} 
 }
 

Modified: trunk/blender/source/blender/src/drawnode.c
===================================================================
--- trunk/blender/source/blender/src/drawnode.c	2008-06-16 19:54:43 UTC (rev 15245)
+++ trunk/blender/source/blender/src/drawnode.c	2008-06-17 04:18:34 UTC (rev 15246)
@@ -517,7 +517,7 @@
 	if(block) { 
 		uiBut *bt; 
 
-		bt=uiDefButS(block, MENU, B_NODE_EXEC,  "Add %x0|Subtract %x1|Multiply %x2|Divide %x3|Sine %x4|Cosine %x5|Tangent %x6|Arcsine %x7|Arccosine %x8|Arctangent %x9|Power %x10|Logarithm %x11|Minimum %x12|Maximum %x13|Round %x14", butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, &node->custom1, 0, 0, 0, 0, ""); 
+		bt=uiDefButS(block, MENU, B_NODE_EXEC,  "Add %x0|Subtract %x1|Multiply %x2|Divide %x3|Sine %x4|Cosine %x5|Tangent %x6|Arcsine %x7|Arccosine %x8|Arctangent %x9|Power %x10|Logarithm %x11|Minimum %x12|Maximum %x13|Round %x14|Less Than %x15|Greater Than %x16", butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, &node->custom1, 0, 0, 0, 0, ""); 
 		uiButSetFunc(bt, node_but_title_cb, node, bt); 
 	} 
 	return 20;