From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- intern/cycles/kernel/osl/bsdf_phong_ramp.cpp | 45 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'intern/cycles/kernel/osl/bsdf_phong_ramp.cpp') diff --git a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp index a8acdb8e342..4b7e59ff932 100644 --- a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp +++ b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp @@ -46,37 +46,36 @@ CCL_NAMESPACE_BEGIN using namespace OSL; class PhongRampClosure : public CBSDFClosure { -public: - PhongRampBsdf params; - Color3 colors[8]; + public: + PhongRampBsdf params; + Color3 colors[8]; - void setup(ShaderData *sd, int /* path_flag */, float3 weight) - { - PhongRampBsdf *bsdf = (PhongRampBsdf*)bsdf_alloc_osl(sd, sizeof(PhongRampBsdf), weight, ¶ms); + void setup(ShaderData *sd, int /* path_flag */, float3 weight) + { + PhongRampBsdf *bsdf = (PhongRampBsdf *)bsdf_alloc_osl( + sd, sizeof(PhongRampBsdf), weight, ¶ms); - if(bsdf) { - bsdf->colors = (float3*)closure_alloc_extra(sd, sizeof(float3)*8); + if (bsdf) { + bsdf->colors = (float3 *)closure_alloc_extra(sd, sizeof(float3) * 8); - if(bsdf->colors) { - for(int i = 0; i < 8; i++) - bsdf->colors[i] = TO_FLOAT3(colors[i]); + if (bsdf->colors) { + for (int i = 0; i < 8; i++) + bsdf->colors[i] = TO_FLOAT3(colors[i]); - sd->flag |= bsdf_phong_ramp_setup(bsdf); - } - } - } + sd->flag |= bsdf_phong_ramp_setup(bsdf); + } + } + } }; ClosureParam *closure_bsdf_phong_ramp_params() { - static ClosureParam params[] = { - CLOSURE_FLOAT3_PARAM(PhongRampClosure, params.N), - CLOSURE_FLOAT_PARAM(PhongRampClosure, params.exponent), - CLOSURE_COLOR_ARRAY_PARAM(PhongRampClosure, colors, 8), - CLOSURE_STRING_KEYPARAM(PhongRampClosure, label, "label"), - CLOSURE_FINISH_PARAM(PhongRampClosure) - }; - return params; + static ClosureParam params[] = {CLOSURE_FLOAT3_PARAM(PhongRampClosure, params.N), + CLOSURE_FLOAT_PARAM(PhongRampClosure, params.exponent), + CLOSURE_COLOR_ARRAY_PARAM(PhongRampClosure, colors, 8), + CLOSURE_STRING_KEYPARAM(PhongRampClosure, label, "label"), + CLOSURE_FINISH_PARAM(PhongRampClosure)}; + return params; } CCLOSURE_PREPARE(closure_bsdf_phong_ramp_prepare, PhongRampClosure) -- cgit v1.2.3