diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/nodes/texture/nodes/node_texture_output.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
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
Diffstat (limited to 'source/blender/nodes/texture/nodes/node_texture_output.c')
-rw-r--r-- | source/blender/nodes/texture/nodes/node_texture_output.c | 217 |
1 files changed, 110 insertions, 107 deletions
diff --git a/source/blender/nodes/texture/nodes/node_texture_output.c b/source/blender/nodes/texture/nodes/node_texture_output.c index ff9226479c9..e44bea3ecac 100644 --- a/source/blender/nodes/texture/nodes/node_texture_output.c +++ b/source/blender/nodes/texture/nodes/node_texture_output.c @@ -21,147 +21,150 @@ * \ingroup texnodes */ - #include "node_texture_util.h" #include "NOD_texture.h" /* **************** COMPOSITE ******************** */ static bNodeSocketTemplate inputs[] = { - { SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f}, - { SOCK_VECTOR, 1, N_("Normal"), 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, PROP_DIRECTION}, - { -1, 0, ""}, + {SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f}, + {SOCK_VECTOR, 1, N_("Normal"), 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, PROP_DIRECTION}, + {-1, 0, ""}, }; /* applies to render pipeline */ -static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *execdata, bNodeStack **in, bNodeStack **UNUSED(out)) +static void exec(void *data, + int UNUSED(thread), + bNode *node, + bNodeExecData *execdata, + bNodeStack **in, + bNodeStack **UNUSED(out)) { - TexCallData *cdata = (TexCallData *)data; - TexResult *target = cdata->target; - - if (cdata->do_preview) { - TexParams params; - params_from_cdata(¶ms, cdata); - - if (in[1] && in[1]->hasinput && !in[0]->hasinput) - tex_input_rgba(&target->tr, in[1], ¶ms, cdata->thread); - else - tex_input_rgba(&target->tr, in[0], ¶ms, cdata->thread); - tex_do_preview(execdata->preview, params.co, &target->tr, cdata->do_manage); - } - else { - /* 0 means don't care, so just use first */ - if (cdata->which_output == node->custom1 || (cdata->which_output == 0 && node->custom1 == 1)) { - TexParams params; - params_from_cdata(¶ms, cdata); - - tex_input_rgba(&target->tr, in[0], ¶ms, cdata->thread); - - target->tin = (target->tr + target->tg + target->tb) / 3.0f; - target->talpha = true; - - if (target->nor) { - if (in[1] && in[1]->hasinput) - tex_input_vec(target->nor, in[1], ¶ms, cdata->thread); - else - target->nor = NULL; - } - } - } + TexCallData *cdata = (TexCallData *)data; + TexResult *target = cdata->target; + + if (cdata->do_preview) { + TexParams params; + params_from_cdata(¶ms, cdata); + + if (in[1] && in[1]->hasinput && !in[0]->hasinput) + tex_input_rgba(&target->tr, in[1], ¶ms, cdata->thread); + else + tex_input_rgba(&target->tr, in[0], ¶ms, cdata->thread); + tex_do_preview(execdata->preview, params.co, &target->tr, cdata->do_manage); + } + else { + /* 0 means don't care, so just use first */ + if (cdata->which_output == node->custom1 || (cdata->which_output == 0 && node->custom1 == 1)) { + TexParams params; + params_from_cdata(¶ms, cdata); + + tex_input_rgba(&target->tr, in[0], ¶ms, cdata->thread); + + target->tin = (target->tr + target->tg + target->tb) / 3.0f; + target->talpha = true; + + if (target->nor) { + if (in[1] && in[1]->hasinput) + tex_input_vec(target->nor, in[1], ¶ms, cdata->thread); + else + target->nor = NULL; + } + } + } } static void unique_name(bNode *node) { - TexNodeOutput *tno = (TexNodeOutput *)node->storage; - char new_name[sizeof(tno->name)]; - int new_len = 0; - int suffix; - bNode *i; - const char *name = tno->name; - - new_name[0] = '\0'; - i = node; - while (i->prev) i = i->prev; - for (; i; i = i->next) { - if (i == node || - i->type != TEX_NODE_OUTPUT || - !STREQ(name, ((TexNodeOutput *)(i->storage))->name)) - { - continue; - } - - if (new_name[0] == '\0') { - int len = strlen(name); - if (len >= 4 && sscanf(name + len - 4, ".%03d", &suffix) == 1) { - new_len = len; - } - else { - suffix = 0; - new_len = len + 4; - if (new_len > (sizeof(tno->name) - 1)) - new_len = (sizeof(tno->name) - 1); - } - - BLI_strncpy(new_name, name, sizeof(tno->name)); - name = new_name; - } - sprintf(new_name + new_len - 4, ".%03d", ++suffix); - } - - if (new_name[0] != '\0') { - BLI_strncpy(tno->name, new_name, sizeof(tno->name)); - } + TexNodeOutput *tno = (TexNodeOutput *)node->storage; + char new_name[sizeof(tno->name)]; + int new_len = 0; + int suffix; + bNode *i; + const char *name = tno->name; + + new_name[0] = '\0'; + i = node; + while (i->prev) + i = i->prev; + for (; i; i = i->next) { + if (i == node || i->type != TEX_NODE_OUTPUT || + !STREQ(name, ((TexNodeOutput *)(i->storage))->name)) { + continue; + } + + if (new_name[0] == '\0') { + int len = strlen(name); + if (len >= 4 && sscanf(name + len - 4, ".%03d", &suffix) == 1) { + new_len = len; + } + else { + suffix = 0; + new_len = len + 4; + if (new_len > (sizeof(tno->name) - 1)) + new_len = (sizeof(tno->name) - 1); + } + + BLI_strncpy(new_name, name, sizeof(tno->name)); + name = new_name; + } + sprintf(new_name + new_len - 4, ".%03d", ++suffix); + } + + if (new_name[0] != '\0') { + BLI_strncpy(tno->name, new_name, sizeof(tno->name)); + } } static void assign_index(struct bNode *node) { - bNode *tnode; - int index = 1; + bNode *tnode; + int index = 1; - tnode = node; - while (tnode->prev) - tnode = tnode->prev; + tnode = node; + while (tnode->prev) + tnode = tnode->prev; check_index: - for (; tnode; tnode = tnode->next) - if (tnode->type == TEX_NODE_OUTPUT && tnode != node) - if (tnode->custom1 == index) { - index++; - goto check_index; - } - - node->custom1 = index; + for (; tnode; tnode = tnode->next) + if (tnode->type == TEX_NODE_OUTPUT && tnode != node) + if (tnode->custom1 == index) { + index++; + goto check_index; + } + + node->custom1 = index; } static void init(bNodeTree *UNUSED(ntree), bNode *node) { - TexNodeOutput *tno = MEM_callocN(sizeof(TexNodeOutput), "TEX_output"); - node->storage = tno; + TexNodeOutput *tno = MEM_callocN(sizeof(TexNodeOutput), "TEX_output"); + node->storage = tno; - strcpy(tno->name, "Default"); - unique_name(node); - assign_index(node); + strcpy(tno->name, "Default"); + unique_name(node); + assign_index(node); } static void copy(bNodeTree *dest_ntree, bNode *dest_node, bNode *src_node) { - node_copy_standard_storage(dest_ntree, dest_node, src_node); - unique_name(dest_node); - assign_index(dest_node); + node_copy_standard_storage(dest_ntree, dest_node, src_node); + unique_name(dest_node); + assign_index(dest_node); } void register_node_type_tex_output(void) { - static bNodeType ntype; + static bNodeType ntype; - tex_node_type_base(&ntype, TEX_NODE_OUTPUT, "Output", NODE_CLASS_OUTPUT, NODE_PREVIEW); - node_type_socket_templates(&ntype, inputs, NULL); - node_type_size_preset(&ntype, NODE_SIZE_MIDDLE); - node_type_init(&ntype, init); - node_type_storage(&ntype, "TexNodeOutput", node_free_standard_storage, copy); - node_type_exec(&ntype, NULL, NULL, exec); + tex_node_type_base(&ntype, TEX_NODE_OUTPUT, "Output", NODE_CLASS_OUTPUT, NODE_PREVIEW); + node_type_socket_templates(&ntype, inputs, NULL); + node_type_size_preset(&ntype, NODE_SIZE_MIDDLE); + node_type_init(&ntype, init); + node_type_storage(&ntype, "TexNodeOutput", node_free_standard_storage, copy); + node_type_exec(&ntype, NULL, NULL, exec); - /* Do not allow muting output. */ - node_type_internal_links(&ntype, NULL); + /* Do not allow muting output. */ + node_type_internal_links(&ntype, NULL); - nodeRegisterType(&ntype); + nodeRegisterType(&ntype); } |