Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Jolly <charlie>2020-02-17 18:15:46 +0300
committerCharlie Jolly <mistajolly@gmail.com>2020-02-17 18:43:18 +0300
commit20a4cdfd700d3722fdcaa3b3952ccea1b0e6ee47 (patch)
tree16eee69e8e1d3bdfb902e05df15b055f7141fd4d /intern/cycles/kernel/svm
parentab3a6e050c856345d10f8e36155913288559e4dc (diff)
Cycles: Vector Rotate Node using Axis and Angle method
This node provides the ability to rotate a vector around a `center` point using either `Axis Angle` , `Single Axis` or `Euler` methods. Reviewed By: #cycles, brecht Differential Revision: https://developer.blender.org/D3789
Diffstat (limited to 'intern/cycles/kernel/svm')
-rw-r--r--intern/cycles/kernel/svm/svm.h4
-rw-r--r--intern/cycles/kernel/svm/svm_types.h14
-rw-r--r--intern/cycles/kernel/svm/svm_vector_rotate.h87
3 files changed, 105 insertions, 0 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index fd2833ee687..88c9dbf5838 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -200,6 +200,7 @@ CCL_NAMESPACE_END
#include "kernel/svm/svm_voronoi.h"
#include "kernel/svm/svm_checker.h"
#include "kernel/svm/svm_brick.h"
+#include "kernel/svm/svm_vector_rotate.h"
#include "kernel/svm/svm_vector_transform.h"
#include "kernel/svm/svm_voxel.h"
#include "kernel/svm/svm_bump.h"
@@ -513,6 +514,9 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg,
case NODE_COMBINE_HSV:
svm_node_combine_hsv(kg, sd, stack, node.y, node.z, node.w, &offset);
break;
+ case NODE_VECTOR_ROTATE:
+ svm_node_vector_rotate(sd, stack, node.y, node.z, node.w);
+ break;
case NODE_VECTOR_TRANSFORM:
svm_node_vector_transform(kg, sd, stack, node);
break;
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index 45c299e0acb..cff2b964c51 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -153,6 +153,7 @@ typedef enum ShaderNodeType {
NODE_AOV_START,
NODE_AOV_VALUE,
NODE_AOV_COLOR,
+ NODE_VECTOR_ROTATE,
} ShaderNodeType;
typedef enum NodeAttributeType {
@@ -351,6 +352,19 @@ typedef enum NodeMappingType {
NODE_MAPPING_TYPE_NORMAL
} NodeMappingType;
+typedef enum NodeVectorRotateType {
+ NODE_VECTOR_ROTATE_TYPE_AXIS,
+ NODE_VECTOR_ROTATE_TYPE_AXIS_X,
+ NODE_VECTOR_ROTATE_TYPE_AXIS_Y,
+ NODE_VECTOR_ROTATE_TYPE_AXIS_Z,
+ NODE_VECTOR_ROTATE_TYPE_EULER_XYZ,
+ NODE_VECTOR_ROTATE_TYPE_EULER_XZY,
+ NODE_VECTOR_ROTATE_TYPE_EULER_YXZ,
+ NODE_VECTOR_ROTATE_TYPE_EULER_YZX,
+ NODE_VECTOR_ROTATE_TYPE_EULER_ZXY,
+ NODE_VECTOR_ROTATE_TYPE_EULER_ZYX,
+} NodeVectorRotateType;
+
typedef enum NodeVectorTransformType {
NODE_VECTOR_TRANSFORM_TYPE_VECTOR,
NODE_VECTOR_TRANSFORM_TYPE_POINT,
diff --git a/intern/cycles/kernel/svm/svm_vector_rotate.h b/intern/cycles/kernel/svm/svm_vector_rotate.h
new file mode 100644
index 00000000000..c7923e10c53
--- /dev/null
+++ b/intern/cycles/kernel/svm/svm_vector_rotate.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2011-2020 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
+
+/* Vector Rotate */
+
+ccl_device void svm_node_vector_rotate(ShaderData *sd,
+ float *stack,
+ uint input_stack_offsets,
+ uint axis_stack_offsets,
+ uint result_stack_offset)
+{
+ uint type, vector_stack_offset, rotation_stack_offset, center_stack_offset, axis_stack_offset,
+ angle_stack_offset;
+
+ svm_unpack_node_uchar3(input_stack_offsets, &type, &vector_stack_offset, &rotation_stack_offset);
+ svm_unpack_node_uchar3(
+ axis_stack_offsets, &center_stack_offset, &axis_stack_offset, &angle_stack_offset);
+
+ float3 vector = stack_load_float3(stack, vector_stack_offset);
+ float3 center = stack_load_float3(stack, center_stack_offset);
+ float3 result = make_float3(0.0f, 0.0f, 0.0f);
+
+ if (type != NODE_VECTOR_ROTATE_TYPE_AXIS && type != NODE_VECTOR_ROTATE_TYPE_AXIS_X &&
+ type != NODE_VECTOR_ROTATE_TYPE_AXIS_Y && type != NODE_VECTOR_ROTATE_TYPE_AXIS_Z) {
+ float3 rotation = stack_load_float3(stack, rotation_stack_offset); // Default XYZ.
+ switch (type) {
+ case NODE_VECTOR_ROTATE_TYPE_EULER_XZY:
+ rotation = make_float3(-rotation.x, -rotation.z, -rotation.y);
+ break;
+ case NODE_VECTOR_ROTATE_TYPE_EULER_YXZ:
+ rotation = make_float3(-rotation.y, -rotation.x, -rotation.z);
+ break;
+ case NODE_VECTOR_ROTATE_TYPE_EULER_YZX:
+ rotation = make_float3(rotation.y, rotation.z, rotation.x);
+ break;
+ case NODE_VECTOR_ROTATE_TYPE_EULER_ZXY:
+ rotation = make_float3(rotation.z, rotation.x, rotation.y);
+ break;
+ case NODE_VECTOR_ROTATE_TYPE_EULER_ZYX:
+ rotation = make_float3(-rotation.z, -rotation.y, -rotation.x);
+ break;
+ }
+ Transform rotationTransform = euler_to_transform(rotation);
+ result = transform_direction(&rotationTransform, vector - center) + center;
+ }
+ else {
+ float3 axis;
+ switch (type) {
+ case NODE_VECTOR_ROTATE_TYPE_AXIS_X:
+ axis = make_float3(1.0f, 0.0f, 0.0f);
+ break;
+ case NODE_VECTOR_ROTATE_TYPE_AXIS_Y:
+ axis = make_float3(0.0f, 1.0f, 0.0f);
+ break;
+ case NODE_VECTOR_ROTATE_TYPE_AXIS_Z:
+ axis = make_float3(0.0f, 0.0f, 1.0f);
+ break;
+ default:
+ axis = normalize(stack_load_float3(stack, axis_stack_offset));
+ break;
+ }
+ float angle = stack_load_float(stack, angle_stack_offset);
+ result = is_zero(axis) ? vector : rotate_around_axis(vector - center, axis, angle) + center;
+ }
+
+ /* Output */
+ if (stack_valid(result_stack_offset)) {
+ stack_store_float3(stack, result_stack_offset, result);
+ }
+}
+
+CCL_NAMESPACE_END