Cleanup: redundent semicolons after function braces
This commit is contained in:
@@ -27,7 +27,7 @@ static void fn_node_legacy_random_float_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Max")).default_value(1.0f).min(-10000.0f).max(10000.0f);
|
||||
b.add_input<decl::Int>(N_("Seed")).min(-10000).max(10000);
|
||||
b.add_output<decl::Float>(N_("Value"));
|
||||
};
|
||||
}
|
||||
|
||||
class RandomFloatFunction : public blender::fn::MultiFunction {
|
||||
public:
|
||||
|
||||
@@ -32,7 +32,7 @@ static void fn_node_boolean_math_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Bool>(N_("Boolean"), "Boolean");
|
||||
b.add_input<decl::Bool>(N_("Boolean"), "Boolean_001");
|
||||
b.add_output<decl::Bool>(N_("Boolean"));
|
||||
};
|
||||
}
|
||||
|
||||
static void fn_node_boolean_math_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -55,7 +55,7 @@ static void fn_node_compare_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Epsilon")).default_value(0.001).min(-10000.0f).max(10000.0f);
|
||||
|
||||
b.add_output<decl::Bool>(N_("Result"));
|
||||
};
|
||||
}
|
||||
|
||||
static void geo_node_compare_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -32,7 +32,7 @@ static void fn_node_float_to_int_declare(NodeDeclarationBuilder &b)
|
||||
b.is_function_node();
|
||||
b.add_input<decl::Float>(N_("Float"));
|
||||
b.add_output<decl::Int>(N_("Integer"));
|
||||
};
|
||||
}
|
||||
|
||||
static void fn_node_float_to_int_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace blender::nodes::node_fn_input_bool_cc {
|
||||
static void fn_node_input_bool_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_output<decl::Bool>(N_("Boolean"));
|
||||
};
|
||||
}
|
||||
|
||||
static void fn_node_input_bool_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace blender::nodes::node_fn_input_color_cc {
|
||||
static void fn_node_input_color_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_output<decl::Color>(N_("Color"));
|
||||
};
|
||||
}
|
||||
|
||||
static void fn_node_input_color_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace blender::nodes::node_fn_input_int_cc {
|
||||
static void fn_node_input_int_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_output<decl::Int>(N_("Integer"));
|
||||
};
|
||||
}
|
||||
|
||||
static void fn_node_input_int_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -22,7 +22,7 @@ static void fn_node_input_special_characters_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_output<decl::String>(N_("Line Break"));
|
||||
b.add_output<decl::String>(N_("Tab"));
|
||||
};
|
||||
}
|
||||
|
||||
class MF_SpecialCharacters : public fn::MultiFunction {
|
||||
public:
|
||||
|
||||
@@ -25,7 +25,7 @@ static void fn_node_input_string_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.is_function_node();
|
||||
b.add_output<decl::String>(N_("String"));
|
||||
};
|
||||
}
|
||||
|
||||
static void fn_node_input_string_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace blender::nodes::node_fn_input_vector_cc {
|
||||
static void fn_node_input_vector_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_output<decl::Vector>(N_("Vector"));
|
||||
};
|
||||
}
|
||||
|
||||
static void fn_node_input_vector_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -27,7 +27,7 @@ static void fn_node_replace_string_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::String>(N_("Replace"))
|
||||
.description(N_("The string to replace each match with"));
|
||||
b.add_output<decl::String>(N_("String"));
|
||||
};
|
||||
}
|
||||
|
||||
static std::string replace_all(std::string str, const std::string &from, const std::string &to)
|
||||
{
|
||||
|
||||
@@ -34,7 +34,7 @@ static void fn_node_rotate_euler_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Vector>(N_("Axis")).default_value({0.0, 0.0, 1.0}).subtype(PROP_XYZ);
|
||||
b.add_input<decl::Float>(N_("Angle")).subtype(PROP_ANGLE);
|
||||
b.add_output<decl::Vector>(N_("Rotation"));
|
||||
};
|
||||
}
|
||||
|
||||
static void fn_node_rotate_euler_update(bNodeTree *ntree, bNode *node)
|
||||
{
|
||||
|
||||
@@ -26,7 +26,7 @@ static void fn_node_slice_string_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Int>(N_("Position"));
|
||||
b.add_input<decl::Int>(N_("Length")).min(0).default_value(10);
|
||||
b.add_output<decl::String>(N_("String"));
|
||||
};
|
||||
}
|
||||
|
||||
static void fn_node_slice_string_build_multi_function(NodeMultiFunctionBuilder &builder)
|
||||
{
|
||||
|
||||
@@ -26,7 +26,7 @@ static void fn_node_string_length_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_input<decl::String>(N_("String"));
|
||||
b.add_output<decl::Int>(N_("Length"));
|
||||
};
|
||||
}
|
||||
|
||||
static void fn_node_string_length_build_multi_function(NodeMultiFunctionBuilder &builder)
|
||||
{
|
||||
|
||||
@@ -24,7 +24,7 @@ static void fn_node_value_to_string_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Value"));
|
||||
b.add_input<decl::Int>(N_("Decimals")).min(0);
|
||||
b.add_output<decl::String>(N_("String"));
|
||||
};
|
||||
}
|
||||
|
||||
static void fn_node_value_to_string_build_multi_function(NodeMultiFunctionBuilder &builder)
|
||||
{
|
||||
|
||||
@@ -28,7 +28,7 @@ static void node_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Vector>(N_("Pivot Point")).subtype(PROP_TRANSLATION).supports_field();
|
||||
b.add_input<decl::Bool>(N_("Local Space")).default_value(true).supports_field();
|
||||
b.add_output<decl::Geometry>(N_("Instances"));
|
||||
};
|
||||
}
|
||||
|
||||
static void rotate_instances(GeoNodeExecParams ¶ms, InstancesComponent &instances_component)
|
||||
{
|
||||
|
||||
@@ -31,7 +31,7 @@ static void node_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Vector>(N_("Center")).subtype(PROP_TRANSLATION).supports_field();
|
||||
b.add_input<decl::Bool>(N_("Local Space")).default_value(true).supports_field();
|
||||
b.add_output<decl::Geometry>(N_("Instances"));
|
||||
};
|
||||
}
|
||||
|
||||
static void scale_instances(GeoNodeExecParams ¶ms, InstancesComponent &instances_component)
|
||||
{
|
||||
|
||||
@@ -23,7 +23,7 @@ static void node_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::String>(N_("Delimiter"));
|
||||
b.add_input<decl::String>(N_("Strings")).multi_input().hide_value();
|
||||
b.add_output<decl::String>(N_("String"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_geo_exec(GeoNodeExecParams params)
|
||||
{
|
||||
|
||||
@@ -26,47 +26,47 @@ static void node_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field();
|
||||
b.add_input<decl::Vector>(N_("Translation")).subtype(PROP_TRANSLATION).supports_field();
|
||||
b.add_input<decl::Bool>(N_("Local Space")).default_value(true).supports_field();
|
||||
b.add_output<decl::Geometry>(N_("Instances"));
|
||||
};
|
||||
b.add_output<decl::Geometry>(N_("Instances"))
|
||||
|
||||
static void translate_instances(GeoNodeExecParams ¶ms, InstancesComponent &instances_component)
|
||||
{
|
||||
GeometryComponentFieldContext field_context{instances_component, ATTR_DOMAIN_INSTANCE};
|
||||
static void
|
||||
translate_instances(GeoNodeExecParams & params, InstancesComponent & instances_component)
|
||||
{
|
||||
GeometryComponentFieldContext field_context{instances_component, ATTR_DOMAIN_INSTANCE};
|
||||
|
||||
fn::FieldEvaluator evaluator{field_context, instances_component.instances_amount()};
|
||||
evaluator.set_selection(params.extract_input<Field<bool>>("Selection"));
|
||||
evaluator.add(params.extract_input<Field<float3>>("Translation"));
|
||||
evaluator.add(params.extract_input<Field<bool>>("Local Space"));
|
||||
evaluator.evaluate();
|
||||
fn::FieldEvaluator evaluator{field_context, instances_component.instances_amount()};
|
||||
evaluator.set_selection(params.extract_input<Field<bool>>("Selection"));
|
||||
evaluator.add(params.extract_input<Field<float3>>("Translation"));
|
||||
evaluator.add(params.extract_input<Field<bool>>("Local Space"));
|
||||
evaluator.evaluate();
|
||||
|
||||
const IndexMask selection = evaluator.get_evaluated_selection_as_mask();
|
||||
const VArray<float3> &translations = evaluator.get_evaluated<float3>(0);
|
||||
const VArray<bool> &local_spaces = evaluator.get_evaluated<bool>(1);
|
||||
const IndexMask selection = evaluator.get_evaluated_selection_as_mask();
|
||||
const VArray<float3> &translations = evaluator.get_evaluated<float3>(0);
|
||||
const VArray<bool> &local_spaces = evaluator.get_evaluated<bool>(1);
|
||||
|
||||
MutableSpan<float4x4> instance_transforms = instances_component.instance_transforms();
|
||||
MutableSpan<float4x4> instance_transforms = instances_component.instance_transforms();
|
||||
|
||||
threading::parallel_for(selection.index_range(), 1024, [&](IndexRange range) {
|
||||
for (const int i_selection : range) {
|
||||
const int i = selection[i_selection];
|
||||
if (local_spaces[i]) {
|
||||
instance_transforms[i] *= float4x4::from_location(translations[i]);
|
||||
threading::parallel_for(selection.index_range(), 1024, [&](IndexRange range) {
|
||||
for (const int i_selection : range) {
|
||||
const int i = selection[i_selection];
|
||||
if (local_spaces[i]) {
|
||||
instance_transforms[i] *= float4x4::from_location(translations[i]);
|
||||
}
|
||||
else {
|
||||
add_v3_v3(instance_transforms[i].values[3], translations[i]);
|
||||
}
|
||||
}
|
||||
else {
|
||||
add_v3_v3(instance_transforms[i].values[3], translations[i]);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
static void node_geo_exec(GeoNodeExecParams params)
|
||||
{
|
||||
GeometrySet geometry_set = params.extract_input<GeometrySet>("Instances");
|
||||
if (geometry_set.has_instances()) {
|
||||
InstancesComponent &instances = geometry_set.get_component_for_write<InstancesComponent>();
|
||||
translate_instances(params, instances);
|
||||
});
|
||||
}
|
||||
|
||||
static void node_geo_exec(GeoNodeExecParams params)
|
||||
{
|
||||
GeometrySet geometry_set = params.extract_input<GeometrySet>("Instances");
|
||||
if (geometry_set.has_instances()) {
|
||||
InstancesComponent &instances = geometry_set.get_component_for_write<InstancesComponent>();
|
||||
translate_instances(params, instances);
|
||||
}
|
||||
params.set_output("Instances", std::move(geometry_set));
|
||||
}
|
||||
params.set_output("Instances", std::move(geometry_set));
|
||||
}
|
||||
|
||||
} // namespace blender::nodes::node_geo_translate_instances_cc
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ static void sh_node_clamp_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Min")).default_value(0.0f).min(-10000.0f).max(10000.0f);
|
||||
b.add_input<decl::Float>(N_("Max")).default_value(1.0f).min(-10000.0f).max(10000.0f);
|
||||
b.add_output<decl::Float>(N_("Result"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_clamp(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -35,7 +35,7 @@ static void sh_node_valtorgb_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Fac")).default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR);
|
||||
b.add_output<decl::Color>(N_("Color"));
|
||||
b.add_output<decl::Float>(N_("Alpha"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_init_valtorgb(bNodeTree *UNUSED(ntree), bNode *node)
|
||||
{
|
||||
|
||||
@@ -31,7 +31,7 @@ static void sh_node_curve_vec_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Fac")).min(0.0f).max(1.0f).default_value(1.0f).subtype(PROP_FACTOR);
|
||||
b.add_input<decl::Vector>(N_("Vector")).min(-1.0f).max(1.0f);
|
||||
b.add_output<decl::Vector>(N_("Vector"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_init_curve_vec(bNodeTree *UNUSED(ntree), bNode *node)
|
||||
{
|
||||
@@ -164,7 +164,7 @@ static void sh_node_curve_rgb_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Fac")).min(0.0f).max(1.0f).default_value(1.0f).subtype(PROP_FACTOR);
|
||||
b.add_input<decl::Color>(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
|
||||
b.add_output<decl::Color>(N_("Color"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_init_curve_rgb(bNodeTree *UNUSED(ntree), bNode *node)
|
||||
{
|
||||
@@ -326,7 +326,7 @@ static void sh_node_curve_float_declare(NodeDeclarationBuilder &b)
|
||||
.subtype(PROP_FACTOR);
|
||||
b.add_input<decl::Float>(N_("Value")).default_value(1.0f).is_default_link_socket();
|
||||
b.add_output<decl::Float>(N_("Value"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_init_curve_float(bNodeTree *UNUSED(ntree), bNode *node)
|
||||
{
|
||||
|
||||
@@ -53,7 +53,7 @@ static void sh_node_map_range_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Vector>(N_("Steps"), "Steps_FLOAT3").default_value(float3(4.0f));
|
||||
b.add_output<decl::Float>(N_("Result"));
|
||||
b.add_output<decl::Vector>(N_("Vector"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_map_range(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -45,7 +45,7 @@ static void sh_node_math_declare(NodeDeclarationBuilder &b)
|
||||
.min(-10000.0f)
|
||||
.max(10000.0f);
|
||||
b.add_output<decl::Float>(N_("Value"));
|
||||
};
|
||||
}
|
||||
|
||||
class SocketSearchOp {
|
||||
public:
|
||||
|
||||
@@ -32,7 +32,7 @@ static void sh_node_mix_rgb_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Color>(N_("Color1")).default_value({0.5f, 0.5f, 0.5f, 1.0f});
|
||||
b.add_input<decl::Color>(N_("Color2")).default_value({0.5f, 0.5f, 0.5f, 1.0f});
|
||||
b.add_output<decl::Color>(N_("Color"));
|
||||
};
|
||||
}
|
||||
|
||||
static const char *gpu_shader_get_name(int mode)
|
||||
{
|
||||
|
||||
@@ -27,7 +27,7 @@ static void node_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Shader>(N_("Shader"));
|
||||
b.add_input<decl::Shader>(N_("Shader"), "Shader_001");
|
||||
b.add_output<decl::Shader>(N_("Shader"));
|
||||
};
|
||||
}
|
||||
|
||||
static int node_shader_gpu_mix_shader(GPUMaterial *mat,
|
||||
bNode *node,
|
||||
|
||||
@@ -30,7 +30,7 @@ static void node_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_input<decl::Color>(N_("Color")).default_value({0.0f, 0.0f, 0.0f, 1.0f});
|
||||
b.add_input<decl::Float>(N_("Value")).default_value(0.0f).min(0.0f).max(1.0f);
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_output_aov(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace blender::nodes::node_shader_output_light_cc {
|
||||
static void node_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_input<decl::Shader>(N_("Surface"));
|
||||
};
|
||||
}
|
||||
|
||||
} // namespace blender::nodes::node_shader_output_light_cc
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ static void node_declare(NodeDeclarationBuilder &b)
|
||||
.min(0.0f)
|
||||
.max(1.0f)
|
||||
.subtype(PROP_FACTOR);
|
||||
};
|
||||
}
|
||||
|
||||
static void node_buts_output_linestyle(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -28,7 +28,7 @@ static void node_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Shader>(N_("Surface"));
|
||||
b.add_input<decl::Shader>(N_("Volume"));
|
||||
b.add_input<decl::Vector>(N_("Displacement")).hide_value();
|
||||
};
|
||||
}
|
||||
|
||||
static int node_shader_gpu_output_material(GPUMaterial *mat,
|
||||
bNode *node,
|
||||
|
||||
@@ -25,7 +25,7 @@ static void node_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_input<decl::Shader>(N_("Surface"));
|
||||
b.add_input<decl::Shader>(N_("Volume"));
|
||||
};
|
||||
}
|
||||
|
||||
static int node_shader_gpu_output_world(GPUMaterial *mat,
|
||||
bNode *node,
|
||||
|
||||
@@ -36,7 +36,7 @@ static void node_declare(NodeDeclarationBuilder &b)
|
||||
b.add_output<decl::Float>(N_("Size"));
|
||||
b.add_output<decl::Vector>(N_("Velocity"));
|
||||
b.add_output<decl::Vector>(N_("Angular Velocity"));
|
||||
};
|
||||
}
|
||||
|
||||
static int gpu_shader_particle_info(GPUMaterial *mat,
|
||||
bNode *node,
|
||||
|
||||
@@ -31,7 +31,7 @@ static void sh_node_rgbtobw_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_input<decl::Color>(N_("Color")).default_value({0.5f, 0.5f, 0.5f, 1.0f});
|
||||
b.add_output<decl::Float>(N_("Val"));
|
||||
};
|
||||
}
|
||||
|
||||
static int gpu_shader_rgbtobw(GPUMaterial *mat,
|
||||
bNode *node,
|
||||
|
||||
@@ -32,7 +32,7 @@ static void sh_node_seprgb_declare(NodeDeclarationBuilder &b)
|
||||
b.add_output<decl::Float>(N_("R"));
|
||||
b.add_output<decl::Float>(N_("G"));
|
||||
b.add_output<decl::Float>(N_("B"));
|
||||
};
|
||||
}
|
||||
|
||||
static int gpu_shader_seprgb(GPUMaterial *mat,
|
||||
bNode *node,
|
||||
@@ -111,7 +111,7 @@ static void sh_node_combrgb_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("G")).min(0.0f).max(1.0f);
|
||||
b.add_input<decl::Float>(N_("B")).min(0.0f).max(1.0f);
|
||||
b.add_output<decl::Color>(N_("Image"));
|
||||
};
|
||||
}
|
||||
|
||||
static int gpu_shader_combrgb(GPUMaterial *mat,
|
||||
bNode *node,
|
||||
|
||||
@@ -32,7 +32,7 @@ static void sh_node_sepxyz_declare(NodeDeclarationBuilder &b)
|
||||
b.add_output<decl::Float>(N_("X"));
|
||||
b.add_output<decl::Float>(N_("Y"));
|
||||
b.add_output<decl::Float>(N_("Z"));
|
||||
};
|
||||
}
|
||||
|
||||
static int gpu_shader_sepxyz(GPUMaterial *mat,
|
||||
bNode *node,
|
||||
@@ -111,7 +111,7 @@ static void sh_node_combxyz_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Y")).min(-10000.0f).max(10000.0f);
|
||||
b.add_input<decl::Float>(N_("Z")).min(-10000.0f).max(10000.0f);
|
||||
b.add_output<decl::Vector>(N_("Vector"));
|
||||
};
|
||||
}
|
||||
|
||||
static int gpu_shader_combxyz(GPUMaterial *mat,
|
||||
bNode *node,
|
||||
|
||||
@@ -26,7 +26,7 @@ static void node_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Shader>(N_("Shader"));
|
||||
b.add_output<decl::Color>(N_("Color"));
|
||||
b.add_output<decl::Float>(N_("Alpha"));
|
||||
};
|
||||
}
|
||||
|
||||
static int node_shader_gpu_shadertorgb(GPUMaterial *mat,
|
||||
bNode *node,
|
||||
|
||||
@@ -29,7 +29,7 @@ namespace blender::nodes::node_shader_tangent_cc {
|
||||
static void node_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_output<decl::Vector>(N_("Tangent"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -58,7 +58,7 @@ static void sh_node_tex_brick_declare(NodeDeclarationBuilder &b)
|
||||
.no_muted_links();
|
||||
b.add_output<decl::Color>(N_("Color"));
|
||||
b.add_output<decl::Float>(N_("Fac"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_tex_brick(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -34,7 +34,7 @@ static void sh_node_tex_checker_declare(NodeDeclarationBuilder &b)
|
||||
.no_muted_links();
|
||||
b.add_output<decl::Color>(N_("Color"));
|
||||
b.add_output<decl::Float>(N_("Fac"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_init_tex_checker(bNodeTree *UNUSED(ntree), bNode *node)
|
||||
{
|
||||
|
||||
@@ -30,7 +30,7 @@ static void sh_node_tex_gradient_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Vector>(N_("Vector")).hide_value().implicit_field();
|
||||
b.add_output<decl::Color>(N_("Color")).no_muted_links();
|
||||
b.add_output<decl::Float>(N_("Fac")).no_muted_links();
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_tex_gradient(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -27,7 +27,7 @@ static void sh_node_tex_image_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Vector>(N_("Vector")).implicit_field();
|
||||
b.add_output<decl::Color>(N_("Color")).no_muted_links();
|
||||
b.add_output<decl::Float>(N_("Alpha")).no_muted_links();
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_init_tex_image(bNodeTree *UNUSED(ntree), bNode *node)
|
||||
{
|
||||
|
||||
@@ -32,7 +32,7 @@ static void sh_node_tex_magic_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Distortion")).min(-1000.0f).max(1000.0f).default_value(1.0f);
|
||||
b.add_output<decl::Color>(N_("Color")).no_muted_links();
|
||||
b.add_output<decl::Float>(N_("Fac")).no_muted_links();
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_tex_magic(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -43,7 +43,7 @@ static void sh_node_tex_musgrave_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Offset")).min(-1000.0f).max(1000.0f);
|
||||
b.add_input<decl::Float>(N_("Gain")).min(0.0f).max(1000.0f).default_value(1.0f);
|
||||
b.add_output<decl::Float>(N_("Fac")).no_muted_links();
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_tex_musgrave(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -46,7 +46,7 @@ static void sh_node_tex_noise_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Distortion")).min(-1000.0f).max(1000.0f).default_value(0.0f);
|
||||
b.add_output<decl::Float>(N_("Fac")).no_muted_links();
|
||||
b.add_output<decl::Color>(N_("Color")).no_muted_links();
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_tex_noise(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -63,7 +63,7 @@ static void sh_node_tex_voronoi_declare(NodeDeclarationBuilder &b)
|
||||
b.add_output<decl::Float>(N_("Radius")).no_muted_links().make_available([](bNode &node) {
|
||||
node_storage(node).feature = SHD_VORONOI_N_SPHERE_RADIUS;
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_tex_voronoi(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -42,7 +42,7 @@ static void sh_node_tex_wave_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Phase Offset")).min(-1000.0f).max(1000.0f).default_value(0.0f);
|
||||
b.add_output<decl::Color>(N_("Color")).no_muted_links();
|
||||
b.add_output<decl::Float>(N_("Fac")).no_muted_links();
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_tex_wave(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -36,7 +36,7 @@ static void sh_node_tex_white_noise_declare(NodeDeclarationBuilder &b)
|
||||
});
|
||||
b.add_output<decl::Float>(N_("Value"));
|
||||
b.add_output<decl::Color>(N_("Color"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_white_noise(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace blender::nodes::node_shader_value_cc {
|
||||
static void sh_node_value_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_output<decl::Float>(N_("Value"));
|
||||
};
|
||||
}
|
||||
|
||||
static int gpu_shader_value(GPUMaterial *mat,
|
||||
bNode *node,
|
||||
|
||||
@@ -42,7 +42,7 @@ static void sh_node_vector_math_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Scale")).default_value(1.0f).min(-10000.0f).max(10000.0f);
|
||||
b.add_output<decl::Vector>(N_("Vector"));
|
||||
b.add_output<decl::Float>(N_("Value"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_vect_math(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
@@ -37,7 +37,7 @@ static void sh_node_vector_rotate_declare(NodeDeclarationBuilder &b)
|
||||
b.add_input<decl::Float>(N_("Angle")).subtype(PROP_ANGLE);
|
||||
b.add_input<decl::Vector>(N_("Rotation")).subtype(PROP_EULER);
|
||||
b.add_output<decl::Vector>(N_("Vector"));
|
||||
};
|
||||
}
|
||||
|
||||
static void node_shader_buts_vector_rotate(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user