[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33093] branches/particles-2010/source/ blender/nodes/intern/SIM_util.c: Added PROP_XYZ and PROP_XYZ_LENGTH properties for scale and dimension to data node RNA property sockets .

[Lukas Toenne]

Revision: 33093
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33093
Author:   lukastoenne
Date:     2010-11-16 08:37:53 +0100 (Tue, 16 Nov 2010)

Log Message:
-----------
Added PROP_XYZ and PROP_XYZ_LENGTH properties for scale and dimension to data node RNA property sockets.

Modified Paths:
--------------
    branches/particles-2010/source/blender/nodes/intern/SIM_util.c

Modified: branches/particles-2010/source/blender/nodes/intern/SIM_util.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_util.c	2010-11-16 04:32:35 UTC (rev 33092)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_util.c	2010-11-16 07:37:53 UTC (rev 33093)
@@ -1077,6 +1077,9 @@
 	}
 }
 
+/************************************/
+/**** Property Socket Conversion ****/
+/************************************/
 
 int sim_rna_socket_type(PropertyRNA *prop)
 {
@@ -1099,6 +1102,8 @@
 		case PROP_DIRECTION:
 		case PROP_VELOCITY:
 		case PROP_ACCELERATION:
+		case PROP_XYZ:
+		case PROP_XYZ_LENGTH:
 			return SOCK_VECTOR;
 		
 		case PROP_COLOR_GAMMA:
@@ -1113,11 +1118,6 @@
 		case PROP_MATRIX:
 			return SOCK_MATRIX;
 		
-		/* TODO how to handle these? */
-		case PROP_XYZ:
-		case PROP_XYZ_LENGTH:
-			return -1;
-		
 		default:
 			return -1;
 		}
@@ -1212,6 +1212,20 @@
 			sock->ns.min=		-1000000.0f;
 			sock->ns.max=		1000000.0f;
 			break;
+		case PROP_XYZ:
+			sock->ns.vec[0]=	1.0f;
+			sock->ns.vec[1]=	1.0f;
+			sock->ns.vec[2]=	1.0f;
+			sock->ns.min=		-1000000.0f;
+			sock->ns.max=		1000000.0f;
+			break;
+		case PROP_XYZ_LENGTH:
+			sock->ns.vec[0]=	0.0f;
+			sock->ns.vec[1]=	0.0f;
+			sock->ns.vec[2]=	0.0f;
+			sock->ns.min=		0.0f;
+			sock->ns.max=		1000000.0f;
+			break;
 		
 		/* SOCK_RGBA */
 		case PROP_COLOR_GAMMA:
@@ -1264,11 +1278,6 @@
 			sock->ns.max=		1000000.0f;
 			break;
 		
-		/* TODO how to handle these? */
-		case PROP_XYZ:
-		case PROP_XYZ_LENGTH:
-			break;
-		
 		default:
 			break;
 		}
@@ -1327,6 +1336,8 @@
 		case PROP_DIRECTION:
 		case PROP_VELOCITY:
 		case PROP_ACCELERATION:
+		case PROP_XYZ:
+		case PROP_XYZ_LENGTH:
 			RNA_property_float_get_array(ptr, prop, vector);
 			sim_output_write_vector(execdata, iter, vector);
 			break;
@@ -1360,11 +1371,6 @@
 			sim_output_write_matrix(execdata, iter, matrix);
 			break;
 		
-		/* TODO how to handle these? */
-		case PROP_XYZ:
-		case PROP_XYZ_LENGTH:
-			break;
-		
 		default:
 			break;
 		}
@@ -1424,6 +1430,8 @@
 		case PROP_DIRECTION:
 		case PROP_VELOCITY:
 		case PROP_ACCELERATION:
+		case PROP_XYZ:
+		case PROP_XYZ_LENGTH:
 			sim_input_read_vector(execdata, iter, vector);
 			RNA_property_float_set_array(ptr, prop, vector);
 			break;
@@ -1457,11 +1465,6 @@
 			RNA_property_float_set_array(ptr, prop, matrix[0]);
 			break;
 		
-		/* TODO how to handle these? */
-		case PROP_XYZ:
-		case PROP_XYZ_LENGTH:
-			break;
-		
 		default:
 			break;
 		}