[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58245] branches/soc-2013-dingto/intern/ cycles: Cycles / Vector Transform node:

[Thomas Dinges]

Revision: 58245
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58245
Author:   dingto
Date:     2013-07-14 22:02:40 +0000 (Sun, 14 Jul 2013)
Log Message:
-----------
Cycles / Vector Transform node:
* Code cleanup, to avoid case-sensitive checks for OSL. 

Modified Paths:
--------------
    branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_vector_transform.osl
    branches/soc-2013-dingto/intern/cycles/render/nodes.cpp

Modified: branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_vector_transform.osl
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_vector_transform.osl	2013-07-14 21:54:15 UTC (rev 58244)
+++ branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_vector_transform.osl	2013-07-14 22:02:40 UTC (rev 58245)
@@ -25,26 +25,12 @@
 	vector VectorIn = vector(0.0, 0.0, 0.0),
 	output vector VectorOut = vector(0.0, 0.0, 0.0))
 {
-	/* OSL uses lower case variable names here */
-	string from = "world";
-	string to = "object";
-	
-	if (convert_from == "Object")
-		from = "object";
-	else if (convert_from == "Camera")
-		from = "camera";
-		
-	if (convert_to == "World")
-		to = "world";
-	else if (convert_to == "Camera")
-		to = "camera";
-	
 	if (type == "Vector") {
-		VectorOut = transform(from, to, VectorIn);
+		VectorOut = transform(convert_from, convert_to, VectorIn);
 	}
 	else if (type == "Point") {
 		point Point = point(VectorIn[0], VectorIn[1], VectorIn[2]);
-		VectorOut = transform(from, to, Point);
+		VectorOut = transform(convert_from, convert_to, Point);
 	}
 }
 

Modified: branches/soc-2013-dingto/intern/cycles/render/nodes.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/render/nodes.cpp	2013-07-14 21:54:15 UTC (rev 58244)
+++ branches/soc-2013-dingto/intern/cycles/render/nodes.cpp	2013-07-14 22:02:40 UTC (rev 58245)
@@ -3238,8 +3238,8 @@
 : ShaderNode("vector_transform")
 {
 	type = ustring("Vector");
-	convert_from = ustring("World");
-	convert_to = ustring("Object");
+	convert_from = ustring("world");
+	convert_to = ustring("object");
 
 	add_input("Vector", SHADER_SOCKET_VECTOR);
 	add_output("Vector",  SHADER_SOCKET_VECTOR);
@@ -3259,9 +3259,9 @@
 {
 	ShaderEnum enm;
 
-	enm.insert("World", NODE_VECTOR_TRANSFORM_CONVERT_FROM_WORLD);
-	enm.insert("Object", NODE_VECTOR_TRANSFORM_CONVERT_FROM_OBJECT);
-	enm.insert("Camera", NODE_VECTOR_TRANSFORM_CONVERT_FROM_CAMERA);
+	enm.insert("world", NODE_VECTOR_TRANSFORM_CONVERT_FROM_WORLD);
+	enm.insert("object", NODE_VECTOR_TRANSFORM_CONVERT_FROM_OBJECT);
+	enm.insert("camera", NODE_VECTOR_TRANSFORM_CONVERT_FROM_CAMERA);
 
 	return enm;
 }
@@ -3270,9 +3270,9 @@
 {
 	ShaderEnum enm;
 
-	enm.insert("World", NODE_VECTOR_TRANSFORM_CONVERT_TO_WORLD);
-	enm.insert("Object", NODE_VECTOR_TRANSFORM_CONVERT_TO_OBJECT);
-	enm.insert("Camera", NODE_VECTOR_TRANSFORM_CONVERT_TO_CAMERA);
+	enm.insert("world", NODE_VECTOR_TRANSFORM_CONVERT_TO_WORLD);
+	enm.insert("object", NODE_VECTOR_TRANSFORM_CONVERT_TO_OBJECT);
+	enm.insert("camera", NODE_VECTOR_TRANSFORM_CONVERT_TO_CAMERA);
 
 	return enm;
 }