[Bf-blender-cvs] [b71e29b3dac] master: Cleanup: clang-format
Aaron Carlisle
noreply at git.blender.org
Wed Dec 8 05:12:20 CET 2021
Commit: b71e29b3dacb4c3071858cb8797e4a4879430392
Author: Aaron Carlisle
Date: Tue Dec 7 23:12:13 2021 -0500
Branches: master
https://developer.blender.org/rBb71e29b3dacb4c3071858cb8797e4a4879430392
Cleanup: clang-format
===================================================================
M intern/cycles/kernel/camera/projection.h
M intern/cycles/scene/camera.cpp
M source/blender/nodes/NOD_socket_declarations.hh
M source/blender/nodes/composite/nodes/node_composite_common.cc
M source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
M source/blender/nodes/geometry/node_geometry_tree.cc
M source/blender/nodes/geometry/nodes/node_geo_common.cc
M source/blender/nodes/geometry/nodes/node_geo_image_texture.cc
M source/blender/nodes/shader/nodes/node_shader_clamp.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_rgb_to_bw.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_image.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
M source/blender/nodes/texture/nodes/node_texture_bricks.c
===================================================================
diff --git a/intern/cycles/kernel/camera/projection.h b/intern/cycles/kernel/camera/projection.h
index ddbe8ad5748..7b4e23e4ed0 100644
--- a/intern/cycles/kernel/camera/projection.h
+++ b/intern/cycles/kernel/camera/projection.h
@@ -146,16 +146,15 @@ fisheye_equisolid_to_direction(float u, float v, float lens, float fov, float wi
return make_float3(cosf(theta), -cosf(phi) * sinf(theta), sinf(phi) * sinf(theta));
}
-ccl_device_inline float3
-fisheye_lens_polynomial_to_direction(float u, float v, float coeff0, float4 coeffs,
- float fov, float width, float height)
+ccl_device_inline float3 fisheye_lens_polynomial_to_direction(
+ float u, float v, float coeff0, float4 coeffs, float fov, float width, float height)
{
u = (u - 0.5f) * width;
v = (v - 0.5f) * height;
float r = sqrtf(u * u + v * v);
- float r2 = r*r;
- float4 rr = make_float4(r, r2, r2*r, r2*r2);
+ float r2 = r * r;
+ float4 rr = make_float4(r, r2, r2 * r, r2 * r2);
float theta = -(coeff0 + dot(coeffs, rr));
if (fabsf(theta) > 0.5f * fov)
@@ -169,16 +168,16 @@ fisheye_lens_polynomial_to_direction(float u, float v, float coeff0, float4 coef
return make_float3(cosf(theta), -cosf(phi) * sinf(theta), sinf(phi) * sinf(theta));
}
-ccl_device float2 direction_to_fisheye_lens_polynomial(float3 dir, float coeff0, float4 coeffs,
- float width, float height)
+ccl_device float2 direction_to_fisheye_lens_polynomial(
+ float3 dir, float coeff0, float4 coeffs, float width, float height)
{
float theta = -safe_acosf(dir.x);
float r = (theta - coeff0) / coeffs.x;
- for (int i=0; i<20; i++) {
- float r2 = r*r;
- float4 rr = make_float4(r, r2, r2*r, r2*r2);
+ for (int i = 0; i < 20; i++) {
+ float r2 = r * r;
+ float4 rr = make_float4(r, r2, r2 * r, r2 * r2);
r = (theta - (coeff0 + dot(coeffs, rr))) / coeffs.x;
}
@@ -190,7 +189,6 @@ ccl_device float2 direction_to_fisheye_lens_polynomial(float3 dir, float coeff0,
return make_float2(u, v);
}
-
/* Mirror Ball <-> Cartesion direction */
ccl_device float3 mirrorball_to_direction(float u, float v)
@@ -237,9 +235,13 @@ ccl_device_inline float3 panorama_to_direction(ccl_constant KernelCamera *cam, f
case PANORAMA_FISHEYE_EQUIDISTANT:
return fisheye_to_direction(u, v, cam->fisheye_fov);
case PANORAMA_FISHEYE_LENS_POLYNOMIAL:
- return fisheye_lens_polynomial_to_direction(
- u, v, cam->fisheye_lens_polynomial_bias, cam->fisheye_lens_polynomial_coefficients, cam->fisheye_fov,
- cam->sensorwidth, cam->sensorheight);
+ return fisheye_lens_polynomial_to_direction(u,
+ v,
+ cam->fisheye_lens_polynomial_bias,
+ cam->fisheye_lens_polynomial_coefficients,
+ cam->fisheye_fov,
+ cam->sensorwidth,
+ cam->sensorheight);
case PANORAMA_FISHEYE_EQUISOLID:
default:
return fisheye_equisolid_to_direction(
@@ -257,9 +259,11 @@ ccl_device_inline float2 direction_to_panorama(ccl_constant KernelCamera *cam, f
case PANORAMA_FISHEYE_EQUIDISTANT:
return direction_to_fisheye(dir, cam->fisheye_fov);
case PANORAMA_FISHEYE_LENS_POLYNOMIAL:
- return direction_to_fisheye_lens_polynomial(
- dir, cam->fisheye_lens_polynomial_bias, cam->fisheye_lens_polynomial_coefficients,
- cam->sensorwidth, cam->sensorheight);
+ return direction_to_fisheye_lens_polynomial(dir,
+ cam->fisheye_lens_polynomial_bias,
+ cam->fisheye_lens_polynomial_coefficients,
+ cam->sensorwidth,
+ cam->sensorheight);
case PANORAMA_FISHEYE_EQUISOLID:
default:
return direction_to_fisheye_equisolid(
diff --git a/intern/cycles/scene/camera.cpp b/intern/cycles/scene/camera.cpp
index 12e106779e3..2f3b55f887f 100644
--- a/intern/cycles/scene/camera.cpp
+++ b/intern/cycles/scene/camera.cpp
@@ -426,8 +426,8 @@ void Camera::update(Scene *scene)
latitude_min - latitude_max,
-latitude_min + M_PI_2_F);
kcam->fisheye_lens_polynomial_bias = fisheye_polynomial_k0;
- kcam->fisheye_lens_polynomial_coefficients = make_float4(fisheye_polynomial_k1, fisheye_polynomial_k2,
- fisheye_polynomial_k3, fisheye_polynomial_k4);
+ kcam->fisheye_lens_polynomial_coefficients = make_float4(
+ fisheye_polynomial_k1, fisheye_polynomial_k2, fisheye_polynomial_k3, fisheye_polynomial_k4);
switch (stereo_eye) {
case STEREO_LEFT:
diff --git a/source/blender/nodes/NOD_socket_declarations.hh b/source/blender/nodes/NOD_socket_declarations.hh
index 98c8fa68876..1b78a09d6a8 100644
--- a/source/blender/nodes/NOD_socket_declarations.hh
+++ b/source/blender/nodes/NOD_socket_declarations.hh
@@ -226,7 +226,8 @@ class Shader : public SocketDeclaration {
bool matches(const bNodeSocket &socket) const override;
};
-class ShaderBuilder : public SocketDeclarationBuilder<Shader> {};
+class ShaderBuilder : public SocketDeclarationBuilder<Shader> {
+};
/* -------------------------------------------------------------------- */
/** \name #FloatBuilder Inline Methods
diff --git a/source/blender/nodes/composite/nodes/node_composite_common.cc b/source/blender/nodes/composite/nodes/node_composite_common.cc
index baea93a78f4..f76ab765a51 100644
--- a/source/blender/nodes/composite/nodes/node_composite_common.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_common.cc
@@ -38,8 +38,7 @@ void register_node_type_cmp_group()
/* NOTE: Cannot use sh_node_type_base for node group, because it would map the node type
* to the shared NODE_GROUP integer type id. */
- node_type_base_custom(
- &ntype, "CompositorNodeGroup", "Group", NODE_CLASS_GROUP, 0);
+ node_type_base_custom(&ntype, "CompositorNodeGroup", "Group", NODE_CLASS_GROUP, 0);
ntype.type = NODE_GROUP;
ntype.poll = cmp_node_poll_default;
ntype.poll_instance = node_group_poll_instance;
diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
index bf9df0b3a36..446a43b638d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@ -297,8 +297,8 @@ static bool node_poll_cryptomatte(bNodeType *UNUSED(ntype),
}
if (scene == nullptr) {
- *r_disabled_hint =
- TIP_("The node tree must be the compositing node tree of any scene in the file");
+ *r_disabled_hint = TIP_(
+ "The node tree must be the compositing node tree of any scene in the file");
}
return scene != nullptr;
}
diff --git a/source/blender/nodes/geometry/node_geometry_tree.cc b/source/blender/nodes/geometry/node_geometry_tree.cc
index 748596ff9e3..3f4089807bc 100644
--- a/source/blender/nodes/geometry/node_geometry_tree.cc
+++ b/source/blender/nodes/geometry/node_geometry_tree.cc
@@ -113,7 +113,8 @@ static bool geometry_node_tree_socket_type_valid(bNodeTreeType *UNUSED(ntreetype
SOCK_MATERIAL);
}
-void register_node_tree_type_geo(){
+void register_node_tree_type_geo()
+{
bNodeTreeType *tt = ntreeType_Geometry = static_cast<bNodeTreeType *>(
MEM_callocN(sizeof(bNodeTreeType), "geometry node tree type"));
tt->type = NTREE_GEOMETRY;
diff --git a/source/blender/nodes/geometry/nodes/node_geo_common.cc b/source/blender/nodes/geometry/nodes/node_geo_common.cc
index 630d2157d32..1a8d04e5da9 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_common.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_common.cc
@@ -22,7 +22,8 @@
#include "node_common.h"
#include "node_geometry_util.hh"
-void register_node_type_geo_group(){
+void register_node_type_geo_group()
+{
static bNodeType ntype;
node_type_base_custom(&ntype, "GeometryNodeGroup", "Group", NODE_CLASS_GROUP, 0);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc
index 5aaa42ecb45..0003f15854d 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc
@@ -410,7 +410,8 @@ static void node_geo_exec(GeoNodeExecParams params)
} // namespace blender::nodes::node_geo_image_texture_cc
-void register_node_type_geo_image_texture(){
+void register_node_type_geo_image_texture()
+{
namespace file_ns = blender::nodes::node_geo_image_texture_cc;
static bNodeType ntype;
diff --git a/source/blender/nodes/shader/nodes/node_shader_clamp.cc b/source/blender/nodes/shader/nodes/node_shader_clamp.cc
index 3ee5831494d..6c3457151e5 100644
--- a/source/blender/nodes/shader/nodes/node_shader_clamp.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_clamp.cc
@@ -75,7 +75,8 @@ static void sh_node_clamp_build_multi_function(blender::nodes::NodeMultiFunction
}
}
-void register_node_type_sh_clamp(){
+void register_node_type_sh_clamp()
+{
static bNodeType ntype;
sh_fn_node_type_base(&ntype, SH_NODE_CLAMP, "Clamp", NODE_CLASS_CONVERTER, 0);
diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.cc b/source/blender/nodes/shader/nodes/node_shader_curves.cc
index 1241d299584..09bbf3d851c 100644
--- a/source/blender/nodes/shader/nodes/node_shader_curves.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_curves.cc
@@ -152,7 +152,8 @@ static void sh_node_curve_vec_build_multi_function(
builder.construct_and_set_matching_fn<CurveVecFunction>(*cumap);
}
-void register_node_type_sh_curve_vec(){
+void register_node_type_sh_curve_vec()
+{
static bNodeType ntype;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list