blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Nodes: move vector rotate node to C++ 

This makes it easier to add an implementation that can
be used in Geometry Nodes.

There should be no functional changes.
This commit is contained in:
Jacques Lucke 2021-03-05 16:09:19 +01:00
parent fe35551df2
commit 8d0fbcd6df
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/nodes/CMakeLists.txt
View File

@ -259,7 +259,7 @@ set(SRC
shader/nodes/node_shader_vectTransform.c
shader/nodes/node_shader_vector_displacement.c
shader/nodes/node_shader_vector_math.cc
shader/nodes/node_shader_vector_rotate.c
shader/nodes/node_shader_vector_rotate.cc
shader/nodes/node_shader_vertex_color.c
shader/nodes/node_shader_volume_absorption.c
shader/nodes/node_shader_volume_info.c

36
source/blender/nodes/shader/nodes/node_shader_vector_rotate.c → source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc
View File

@ -32,7 +32,28 @@ static bNodeSocketTemplate sh_node_vector_rotate_in[] = {
{SOCK_VECTOR, N_("Rotation"), 0.0f, 0.0f, 0.0f, 1.0f, -FLT_MAX, FLT_MAX, PROP_EULER},
{-1, ""}};
static bNodeSocketTemplate sh_node_vector_rotate_out[] = {{SOCK_VECTOR, N_("Vector")}, {-1, ""}};
static bNodeSocketTemplate sh_node_vector_rotate_out[] = {
{SOCK_VECTOR, N_("Vector")},
{-1, ""},
};
static const char *gpu_shader_get_name(int mode)
{
switch (mode) {
case NODE_VECTOR_ROTATE_TYPE_AXIS:
return "node_vector_rotate_axis_angle";
case NODE_VECTOR_ROTATE_TYPE_AXIS_X:
return "node_vector_rotate_axis_x";
case NODE_VECTOR_ROTATE_TYPE_AXIS_Y:
return "node_vector_rotate_axis_y";
case NODE_VECTOR_ROTATE_TYPE_AXIS_Z:
return "node_vector_rotate_axis_z";
case NODE_VECTOR_ROTATE_TYPE_EULER_XYZ:
return "node_vector_rotate_euler_xyz";
}
return nullptr;
}
static int gpu_shader_vector_rotate(GPUMaterial *mat,
bNode *node,
@ -40,18 +61,11 @@ static int gpu_shader_vector_rotate(GPUMaterial *mat,
GPUNodeStack *in,
GPUNodeStack *out)
{
const char *name = gpu_shader_get_name(node->custom1);
static const char *names[] = {
[NODE_VECTOR_ROTATE_TYPE_AXIS] = "node_vector_rotate_axis_angle",
[NODE_VECTOR_ROTATE_TYPE_AXIS_X] = "node_vector_rotate_axis_x",
[NODE_VECTOR_ROTATE_TYPE_AXIS_Y] = "node_vector_rotate_axis_y",
[NODE_VECTOR_ROTATE_TYPE_AXIS_Z] = "node_vector_rotate_axis_z",
[NODE_VECTOR_ROTATE_TYPE_EULER_XYZ] = "node_vector_rotate_euler_xyz",
};
if (node->custom1 < ARRAY_SIZE(names) && names[node->custom1]) {
if (name != nullptr) {
float invert = (node->custom2) ? -1.0 : 1.0;
return GPU_stack_link(mat, node, names[node->custom1], in, out, GPU_constant(&invert));
return GPU_stack_link(mat, node, name, in, out, GPU_constant(&invert));
}
return 0;