DagerD/blender
1
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

MaterialX: Implement export of Input nodes #20

Merged
Bogdan Nagirniak merged 26 commits from Vasyl-Pidhirskyi/blender:BLEN-530 into matx-export-material 2023-09-15 19:55:37 +02:00
Conversation 0 Commits 26 Files Changed 20 +15
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 78bae37417 - Show all commits

15
source/blender/nodes/shader/nodes/node_shader_camera.cc
View File

@ -26,6 +26,20 @@ static int gpu_shader_camera(GPUMaterial *mat,
return GPU_stack_link(mat, node, "camera", in, out); return GPU_stack_link(mat, node, "camera", in, out);
} }
NODE_SHADER_MATERIALX_BEGIN
{
/* TODO: This node doesn't have an implementation in MaterialX 1.38.6.*/
NodeItem res = val(MaterialX::Vector3(1.0f, 1.0f, 1.0f));
if (STREQ(socket_out_->name, "View Z Depth")) {
res = res.extract(2);
}
if (STREQ(socket_out_->name, "View Distance")) {
res = res.extract(2);
}
return res;
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-09-13 16:54:17 +02:00
Outdated
Review
Copy Link

start from empty(), use else if

start from `empty()`, use `else if`
}
NODE_SHADER_MATERIALX_END
} // namespace blender::nodes::node_shader_camera_cc } // namespace blender::nodes::node_shader_camera_cc
void register_node_type_sh_camera() void register_node_type_sh_camera()
@ -37,6 +51,7 @@ void register_node_type_sh_camera()
sh_node_type_base(&ntype, SH_NODE_CAMERA, "Camera Data", NODE_CLASS_INPUT); sh_node_type_base(&ntype, SH_NODE_CAMERA, "Camera Data", NODE_CLASS_INPUT);
ntype.declare = file_ns::node_declare; ntype.declare = file_ns::node_declare;
ntype.gpu_fn = file_ns::gpu_shader_camera; ntype.gpu_fn = file_ns::gpu_shader_camera;
ntype.materialx_fn = file_ns::node_shader_materialx;
nodeRegisterType(&ntype); nodeRegisterType(&ntype);
} }