[Bf-blender-cvs] [2564d152d6e] master: Cleanup: Remove unnecessary namespace specification
Hans Goudey
noreply at git.blender.org
Wed Mar 16 18:33:42 CET 2022
Commit: 2564d152d6edf65afcb573598a1303483c62eb06
Author: Hans Goudey
Date: Wed Mar 16 12:33:36 2022 -0500
Branches: master
https://developer.blender.org/rB2564d152d6edf65afcb573598a1303483c62eb06
Cleanup: Remove unnecessary namespace specification
Ever since d5b72fb06cd0405c46, shader nodes have been in the
`blender::nodes` namespace, so they don't need to use that to access
Blender's C++ types and functions.
===================================================================
M source/blender/nodes/shader/nodes/node_shader_clamp.cc
M source/blender/nodes/shader/nodes/node_shader_color_ramp.cc
M source/blender/nodes/shader/nodes/node_shader_curves.cc
M source/blender/nodes/shader/nodes/node_shader_map_range.cc
M source/blender/nodes/shader/nodes/node_shader_math.cc
M source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc
M source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc
M source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc
M source/blender/nodes/shader/nodes/node_shader_tex_brick.cc
M source/blender/nodes/shader/nodes/node_shader_tex_checker.cc
M source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc
M source/blender/nodes/shader/nodes/node_shader_tex_magic.cc
M source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc
M source/blender/nodes/shader/nodes/node_shader_tex_noise.cc
M source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc
M source/blender/nodes/shader/nodes/node_shader_tex_wave.cc
M source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc
M source/blender/nodes/shader/nodes/node_shader_value.cc
M source/blender/nodes/shader/nodes/node_shader_vector_math.cc
M source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc
===================================================================
diff --git a/source/blender/nodes/shader/nodes/node_shader_clamp.cc b/source/blender/nodes/shader/nodes/node_shader_clamp.cc
index 9b1d2ee1d63..c8785721dfb 100644
--- a/source/blender/nodes/shader/nodes/node_shader_clamp.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_clamp.cc
@@ -42,12 +42,12 @@ static int gpu_shader_clamp(GPUMaterial *mat,
GPU_stack_link(mat, node, "clamp_range", in, out);
}
-static void sh_node_clamp_build_multi_function(blender::nodes::NodeMultiFunctionBuilder &builder)
+static void sh_node_clamp_build_multi_function(NodeMultiFunctionBuilder &builder)
{
- static blender::fn::CustomMF_SI_SI_SI_SO<float, float, float, float> minmax_fn{
+ static fn::CustomMF_SI_SI_SI_SO<float, float, float, float> minmax_fn{
"Clamp (Min Max)",
[](float value, float min, float max) { return std::min(std::max(value, min), max); }};
- static blender::fn::CustomMF_SI_SI_SI_SO<float, float, float, float> range_fn{
+ static fn::CustomMF_SI_SI_SI_SO<float, float, float, float> range_fn{
"Clamp (Range)", [](float value, float a, float b) {
if (a < b) {
return clamp_f(value, a, b);
diff --git a/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc b/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc
index 0c8cc209d5a..3723480ffa3 100644
--- a/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc
@@ -87,37 +87,35 @@ static int gpu_shader_valtorgb(GPUMaterial *mat,
return GPU_stack_link(mat, node, "valtorgb", in, out, tex, GPU_constant(&layer));
}
-class ColorBandFunction : public blender::fn::MultiFunction {
+class ColorBandFunction : public fn::MultiFunction {
private:
const ColorBand &color_band_;
public:
ColorBandFunction(const ColorBand &color_band) : color_band_(color_band)
{
- static blender::fn::MFSignature signature = create_signature();
+ static fn::MFSignature signature = create_signature();
this->set_signature(&signature);
}
- static blender::fn::MFSignature create_signature()
+ static fn::MFSignature create_signature()
{
- blender::fn::MFSignatureBuilder signature{"Color Band"};
+ fn::MFSignatureBuilder signature{"Color Band"};
signature.single_input<float>("Value");
- signature.single_output<blender::ColorGeometry4f>("Color");
+ signature.single_output<ColorGeometry4f>("Color");
signature.single_output<float>("Alpha");
return signature.build();
}
- void call(blender::IndexMask mask,
- blender::fn::MFParams params,
- blender::fn::MFContext UNUSED(context)) const override
+ void call(IndexMask mask, fn::MFParams params, fn::MFContext UNUSED(context)) const override
{
- const blender::VArray<float> &values = params.readonly_single_input<float>(0, "Value");
- blender::MutableSpan<blender::ColorGeometry4f> colors =
- params.uninitialized_single_output<blender::ColorGeometry4f>(1, "Color");
- blender::MutableSpan<float> alphas = params.uninitialized_single_output<float>(2, "Alpha");
+ const VArray<float> &values = params.readonly_single_input<float>(0, "Value");
+ MutableSpan<ColorGeometry4f> colors = params.uninitialized_single_output<ColorGeometry4f>(
+ 1, "Color");
+ MutableSpan<float> alphas = params.uninitialized_single_output<float>(2, "Alpha");
for (int64_t i : mask) {
- blender::ColorGeometry4f color;
+ ColorGeometry4f color;
BKE_colorband_evaluate(&color_band_, values[i], color);
colors[i] = color;
alphas[i] = color.a;
@@ -125,8 +123,7 @@ class ColorBandFunction : public blender::fn::MultiFunction {
}
};
-static void sh_node_valtorgb_build_multi_function(
- blender::nodes::NodeMultiFunctionBuilder &builder)
+static void sh_node_valtorgb_build_multi_function(nodes::NodeMultiFunctionBuilder &builder)
{
bNode &bnode = builder.node();
const ColorBand *color_band = (const ColorBand *)bnode.storage;
diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.cc b/source/blender/nodes/shader/nodes/node_shader_curves.cc
index 64a5cd97250..b1db0248d9f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_curves.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_curves.cc
@@ -72,35 +72,31 @@ static int gpu_shader_curve_vec(GPUMaterial *mat,
GPU_uniform(ext_xyz[2]));
}
-class CurveVecFunction : public blender::fn::MultiFunction {
+class CurveVecFunction : public fn::MultiFunction {
private:
const CurveMapping &cumap_;
public:
CurveVecFunction(const CurveMapping &cumap) : cumap_(cumap)
{
- static blender::fn::MFSignature signature = create_signature();
+ static fn::MFSignature signature = create_signature();
this->set_signature(&signature);
}
- static blender::fn::MFSignature create_signature()
+ static fn::MFSignature create_signature()
{
- blender::fn::MFSignatureBuilder signature{"Curve Vec"};
+ fn::MFSignatureBuilder signature{"Curve Vec"};
signature.single_input<float>("Fac");
- signature.single_input<blender::float3>("Vector");
- signature.single_output<blender::float3>("Vector");
+ signature.single_input<float3>("Vector");
+ signature.single_output<float3>("Vector");
return signature.build();
}
- void call(blender::IndexMask mask,
- blender::fn::MFParams params,
- blender::fn::MFContext UNUSED(context)) const override
+ void call(IndexMask mask, fn::MFParams params, fn::MFContext UNUSED(context)) const override
{
- const blender::VArray<float> &fac = params.readonly_single_input<float>(0, "Fac");
- const blender::VArray<blender::float3> &vec_in = params.readonly_single_input<blender::float3>(
- 1, "Vector");
- blender::MutableSpan<blender::float3> vec_out =
- params.uninitialized_single_output<blender::float3>(2, "Vector");
+ const VArray<float> &fac = params.readonly_single_input<float>(0, "Fac");
+ const VArray<float3> &vec_in = params.readonly_single_input<float3>(1, "Vector");
+ MutableSpan<float3> vec_out = params.uninitialized_single_output<float3>(2, "Vector");
for (int64_t i : mask) {
BKE_curvemapping_evaluate3F(&cumap_, vec_out[i], vec_in[i]);
@@ -111,8 +107,7 @@ class CurveVecFunction : public blender::fn::MultiFunction {
}
};
-static void sh_node_curve_vec_build_multi_function(
- blender::nodes::NodeMultiFunctionBuilder &builder)
+static void sh_node_curve_vec_build_multi_function(NodeMultiFunctionBuilder &builder)
{
bNode &bnode = builder.node();
CurveMapping *cumap = (CurveMapping *)bnode.storage;
@@ -230,35 +225,33 @@ static int gpu_shader_curve_rgb(GPUMaterial *mat,
GPU_uniform(ext_rgba[3]));
}
-class CurveRGBFunction : public blender::fn::MultiFunction {
+class CurveRGBFunction : public fn::MultiFunction {
private:
const CurveMapping &cumap_;
public:
CurveRGBFunction(const CurveMapping &cumap) : cumap_(cumap)
{
- static blender::fn::MFSignature signature = create_signature();
+ static fn::MFSignature signature = create_signature();
this->set_signature(&signature);
}
- static blender::fn::MFSignature create_signature()
+ static fn::MFSignature create_signature()
{
- blender::fn::MFSignatureBuilder signature{"Curve RGB"};
+ fn::MFSignatureBuilder signature{"Curve RGB"};
signature.single_input<float>("Fac");
- signature.single_input<blender::ColorGeometry4f>("Color");
- signature.single_output<blender::ColorGeometry4f>("Color");
+ signature.single_input<ColorGeometry4f>("Color");
+ signature.single_output<ColorGeometry4f>("Color");
return signature.build();
}
- void call(blender::IndexMask mask,
- blender::fn::MFParams params,
- blender::fn::MFContext UNUSED(context)) const override
+ void call(IndexMask mask, fn::MFParams params, fn::MFContext UNUSED(context)) const override
{
- const blender::VArray<float> &fac = params.readonly_single_input<float>(0, "Fac");
- const blender::VArray<blender::ColorGeometry4f> &col_in =
- params.readonly_single_input<blender::ColorGeometry4f>(1, "Color");
- blender::MutableSpan<blender::ColorGeometry4f> col_out =
- params.uninitialized_single_output<blender::ColorGeometry4f>(2, "Color");
+ const VArray<float> &fac = params.readonly_single_input<float>(0, "Fac");
+ const VArray<ColorGeometry4f> &col_in = params.readonly_single_input<ColorGeometry4f>(1,
+ "Color");
+ MutableSpan<ColorGeometry4f> col_out = params.uninitialized_single_output<ColorGeometry4f>(
+ 2, "Color");
for (int64_t i : mask) {
BKE_curvemapping_evaluateRGBF(&cumap_, col_out[i], col_in[i]);
@@ -269,8 +262,7 @@ class CurveRGBFunction : public blender::fn::MultiFunction {
}
};
-static void sh_node_curve_rgb_build_multi_function(
- blender::nodes::NodeMultiFunctionBuilder &builder)
+static void sh_node_curve_rgb_build_multi_function(NodeMultiFunctionBuilder &builder)
{
bNode &bnode = builder.node();
CurveMapping *cumap = (CurveMapping *)bnode.storage;
@@ -360,33 +352,31 @@ static int gpu_shader_curve_float(GPUMaterial *mat,
GPU_uniform(ext_xyz));
}
-class CurveFloatFunction : public blender::fn::MultiFunction {
+class CurveFloatFunction : public fn::MultiFunction {
private:
const CurveMapping &cumap_;
public:
CurveFloatFunction(const CurveMapping &cumap) : cumap_(cumap)
{
- static blender::fn::MFSignature signature = create_signature();
+ static fn::MFSignature signature = create_signature();
this->set_signature(&signature);
}
- static blender::fn::MFSignature create_signature()
+ static fn::MFSignature create_signature()
{
- blender::fn::MFSignatureBuilder signature{"Curve Float"};
+ fn::MFSignatureBuilder signature{"Curve Float"};
signature.single_input<float>("Factor");
signature.single_input<float>("Value");
signature.single_output<float>("Value");
return signature.build();
}
- void call(blender::IndexMask mask,
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list