baaa89a0bc
This patch rewrites the Mapping node to support dynamic inputs. The Max and Min options have been removed. They can be added as Min and Max Vector Math nodes manually. Texture nodes still use the old matrix-based mapping. A new SVM node `NODE_TEXTURE_MAPPING` has been added to preserve this functionality. Similarly, in GLSL, a `mapping_mat4` function has been added. Reviewers: brecht, JacquesLucke
74 lines
2.5 KiB
C
74 lines
2.5 KiB
C
/*
|
|
* Copyright 2011-2013 Blender Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
/* Mapping Node */
|
|
|
|
ccl_device void svm_node_mapping(KernelGlobals *kg,
|
|
ShaderData *sd,
|
|
float *stack,
|
|
uint type,
|
|
uint inputs_stack_offsets,
|
|
uint result_stack_offset,
|
|
int *offset)
|
|
{
|
|
uint vector_stack_offset, location_stack_offset, rotation_stack_offset, scale_stack_offset;
|
|
svm_unpack_node_uchar4(inputs_stack_offsets,
|
|
&vector_stack_offset,
|
|
&location_stack_offset,
|
|
&rotation_stack_offset,
|
|
&scale_stack_offset);
|
|
|
|
float3 vector = stack_load_float3(stack, vector_stack_offset);
|
|
float3 location = stack_load_float3(stack, location_stack_offset);
|
|
float3 rotation = stack_load_float3(stack, rotation_stack_offset);
|
|
float3 scale = stack_load_float3(stack, scale_stack_offset);
|
|
|
|
float3 result = svm_mapping((NodeMappingType)type, vector, location, rotation, scale);
|
|
stack_store_float3(stack, result_stack_offset, result);
|
|
}
|
|
|
|
/* Texture Mapping */
|
|
|
|
ccl_device void svm_node_texture_mapping(
|
|
KernelGlobals *kg, ShaderData *sd, float *stack, uint vec_offset, uint out_offset, int *offset)
|
|
{
|
|
float3 v = stack_load_float3(stack, vec_offset);
|
|
|
|
Transform tfm;
|
|
tfm.x = read_node_float(kg, offset);
|
|
tfm.y = read_node_float(kg, offset);
|
|
tfm.z = read_node_float(kg, offset);
|
|
|
|
float3 r = transform_point(&tfm, v);
|
|
stack_store_float3(stack, out_offset, r);
|
|
}
|
|
|
|
ccl_device void svm_node_min_max(
|
|
KernelGlobals *kg, ShaderData *sd, float *stack, uint vec_offset, uint out_offset, int *offset)
|
|
{
|
|
float3 v = stack_load_float3(stack, vec_offset);
|
|
|
|
float3 mn = float4_to_float3(read_node_float(kg, offset));
|
|
float3 mx = float4_to_float3(read_node_float(kg, offset));
|
|
|
|
float3 r = min(max(mn, v), mx);
|
|
stack_store_float3(stack, out_offset, r);
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|