Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix mapping node min/max not working OSL.

Browse Source
This commit is contained in:
Brecht Van Lommel
2012-12-06 09:13:57 +00:00
parent 8274848fa1
commit c20292f624
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/kernel/shaders/node_mapping.osl
View File

@@ -20,9 +20,17 @@
shader node_mapping( shader node_mapping(
matrix Matrix = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), matrix Matrix = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
point mapping_min = point(0.0, 0.0, 0.0),
point mapping_max = point(0.0, 0.0, 0.0),
int use_minmax = 0,
point VectorIn = point(0.0, 0.0, 0.0), point VectorIn = point(0.0, 0.0, 0.0),
output point VectorOut = point(0.0, 0.0, 0.0)) output point VectorOut = point(0.0, 0.0, 0.0))
{ {
VectorOut = transform(Matrix, VectorIn); point p = transform(Matrix, VectorIn);
if(use_minmax)
p = min(max(mapping_min, p), mapping_max);
VectorOut = p;
} }

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

@@ -1098,6 +1098,9 @@ void MappingNode::compile(OSLCompiler& compiler)
{ {
Transform tfm = transform_transpose(tex_mapping.compute_transform()); Transform tfm = transform_transpose(tex_mapping.compute_transform());
compiler.parameter("Matrix", tfm); compiler.parameter("Matrix", tfm);
compiler.parameter_point("mapping_min", tex_mapping.min);
compiler.parameter_point("mapping_max", tex_mapping.max);
compiler.parameter("use_minmax", tex_mapping.use_minmax);
compiler.add(this, "node_mapping"); compiler.add(this, "node_mapping");
} }