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/shaders
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/shaders')
-rw-r--r--intern/cycles/kernel/shaders/CMakeLists.txt1
-rw-r--r--intern/cycles/kernel/shaders/node_math.h21
-rw-r--r--intern/cycles/kernel/shaders/node_vector_rotate.osl70
3 files changed, 92 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt
index 1c9445107ad..958ebe2f04e 100644
--- a/intern/cycles/kernel/shaders/CMakeLists.txt
+++ b/intern/cycles/kernel/shaders/CMakeLists.txt
@@ -78,6 +78,7 @@ set(SRC_OSL
node_value.osl
node_vector_curves.osl
node_vector_math.osl
+ node_vector_rotate.osl
node_vector_transform.osl
node_velvet_bsdf.osl
node_vertex_color.osl
diff --git a/intern/cycles/kernel/shaders/node_math.h b/intern/cycles/kernel/shaders/node_math.h
index 7d8478672af..4b1a6c5bc16 100644
--- a/intern/cycles/kernel/shaders/node_math.h
+++ b/intern/cycles/kernel/shaders/node_math.h
@@ -87,3 +87,24 @@ point wrap(point value, point max, point min)
wrap(value[1], max[1], min[1]),
wrap(value[2], max[2], min[2]));
}
+
+matrix euler_to_mat(point euler)
+{
+ float cx = cos(euler[0]);
+ float cy = cos(euler[1]);
+ float cz = cos(euler[2]);
+ float sx = sin(euler[0]);
+ float sy = sin(euler[1]);
+ float sz = sin(euler[2]);
+ matrix mat = matrix(1.0);
+ mat[0][0] = cy * cz;
+ mat[0][1] = cy * sz;
+ mat[0][2] = -sy;
+ mat[1][0] = sy * sx * cz - cx * sz;
+ mat[1][1] = sy * sx * sz + cx * cz;
+ mat[1][2] = cy * sx;
+ +mat[2][0] = sy * cx * cz + sx * sz;
+ mat[2][1] = sy * cx * sz - sx * cz;
+ mat[2][2] = cy * cx;
+ return mat;
+}
diff --git a/intern/cycles/kernel/shaders/node_vector_rotate.osl b/intern/cycles/kernel/shaders/node_vector_rotate.osl
new file mode 100644
index 00000000000..a049ee92dbc
--- /dev/null
+++ b/intern/cycles/kernel/shaders/node_vector_rotate.osl
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+#include "stdcycles.h"
+#include "node_math.h"
+
+shader node_vector_rotate(string type = "axis",
+ vector VectorIn = vector(0.0, 0.0, 0.0),
+ point Center = point(0.0, 0.0, 0.0),
+ point Rotation = point(0.0, 0.0, 0.0),
+ vector Axis = vector(0.0, 0.0, 1.0),
+ float Angle = 0.0,
+ output vector VectorOut = vector(0.0, 0.0, 0.0))
+{
+ if (type == "euler_xyz") {
+ VectorOut = transform(euler_to_mat(Rotation), VectorIn - Center) + Center;
+ }
+ else if (type == "euler_xzy") {
+ VectorOut = transform(euler_to_mat(point(-Rotation[0], -Rotation[2], -Rotation[1])),
+ VectorIn - Center) +
+ Center;
+ }
+ else if (type == "euler_yxz") {
+ VectorOut = transform(euler_to_mat(point(-Rotation[1], -Rotation[0], -Rotation[2])),
+ VectorIn - Center) +
+ Center;
+ }
+ else if (type == "euler_yzx") {
+ VectorOut = transform(euler_to_mat(point(Rotation[1], Rotation[2], Rotation[0])),
+ VectorIn - Center) +
+ Center;
+ }
+ else if (type == "euler_zxy") {
+ VectorOut = transform(euler_to_mat(point(Rotation[2], Rotation[0], Rotation[1])),
+ VectorIn - Center) +
+ Center;
+ }
+ else if (type == "euler_zyx") {
+ VectorOut = transform(euler_to_mat(point(-Rotation[2], -Rotation[1], -Rotation[0])),
+ VectorIn - Center) +
+ Center;
+ }
+ else if (type == "x_axis") {
+ VectorOut = rotate(VectorIn - Center, Angle, point(0.0), vector(1.0, 0.0, 0.0)) + Center;
+ }
+ else if (type == "y_axis") {
+ VectorOut = rotate(VectorIn - Center, Angle, point(0.0), vector(0.0, 1.0, 0.0)) + Center;
+ }
+ else if (type == "z_axis") {
+ VectorOut = rotate(VectorIn - Center, Angle, point(0.0), vector(0.0, 0.0, 1.0)) + Center;
+ }
+ else { // axis
+ VectorOut = (length(Axis) != 0.0) ?
+ rotate(VectorIn - Center, Angle, point(0.0), Axis) + Center :
+ VectorIn;
+ }
+}