griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles / Vector Transform node:

Browse Source 
* Code cleanup, to avoid case-sensitive checks for OSL.
This commit is contained in:
Thomas Dinges
2013-07-14 22:02:40 +00:00
parent 11fe01b0da
commit b39a84e9aa
2 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
intern/cycles/kernel/shaders/node_vector_transform.osl
View File

@@ -25,26 +25,12 @@ shader node_vector_transform(
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);
}
}

16
intern/cycles/render/nodes.cpp
View File

@@ -3238,8 +3238,8 @@ VectorTransformNode::VectorTransformNode()
: 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 @@ static ShaderEnum vector_transform_convert_from_init()
{
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 @@ static ShaderEnum vector_transform_convert_to_init()
{
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;
}