Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/nodes
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/NOD_static_types.h2
-rw-r--r--source/blender/nodes/intern/node_socket.c60
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_math.c30
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_particle_info.c2
4 files changed, 57 insertions, 37 deletions
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index 8e3896f40f7..69f2a0ae955 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -69,7 +69,7 @@ DefNode( ShaderNode, SH_NODE_OUTPUT_MATERIAL, 0, "OU
DefNode( ShaderNode, SH_NODE_OUTPUT_LAMP, 0, "OUTPUT_LAMP", OutputLamp, "Lamp Output", "" )
DefNode( ShaderNode, SH_NODE_OUTPUT_WORLD, 0, "OUTPUT_WORLD", OutputWorld, "World Output", "" )
DefNode( ShaderNode, SH_NODE_FRESNEL, 0, "FRESNEL", Fresnel, "Fresnel", "" )
-DefNode( ShaderNode, SH_NODE_LAYER_WEIGHT, 0, "LAYER_WEIGHT", LayerWeight, "LayerWeight", "" )
+DefNode( ShaderNode, SH_NODE_LAYER_WEIGHT, 0, "LAYER_WEIGHT", LayerWeight, "Layer Weight", "" )
DefNode( ShaderNode, SH_NODE_MIX_SHADER, 0, "MIX_SHADER", MixShader, "Mix Shader", "" )
DefNode( ShaderNode, SH_NODE_ADD_SHADER, 0, "ADD_SHADER", AddShader, "Add Shader", "" )
DefNode( ShaderNode, SH_NODE_ATTRIBUTE, def_sh_attribute, "ATTRIBUTE", Attribute, "Attribute", "" )
diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c
index 0fd6d871dc1..92d403685d0 100644
--- a/source/blender/nodes/intern/node_socket.c
+++ b/source/blender/nodes/intern/node_socket.c
@@ -60,26 +60,30 @@ struct bNodeSocket *node_add_socket_from_template(struct bNodeTree *ntree, struc
/* initialize default_value */
switch (stemp->type) {
- case SOCK_FLOAT: {
+ case SOCK_FLOAT:
+ {
bNodeSocketValueFloat *dval = sock->default_value;
dval->value = stemp->val1;
dval->min = stemp->min;
dval->max = stemp->max;
break;
}
- case SOCK_INT: {
+ case SOCK_INT:
+ {
bNodeSocketValueInt *dval = sock->default_value;
dval->value = (int)stemp->val1;
dval->min = (int)stemp->min;
dval->max = (int)stemp->max;
break;
}
- case SOCK_BOOLEAN: {
+ case SOCK_BOOLEAN:
+ {
bNodeSocketValueBoolean *dval = sock->default_value;
dval->value = (int)stemp->val1;
break;
}
- case SOCK_VECTOR: {
+ case SOCK_VECTOR:
+ {
bNodeSocketValueVector *dval = sock->default_value;
dval->value[0] = stemp->val1;
dval->value[1] = stemp->val2;
@@ -88,7 +92,8 @@ struct bNodeSocket *node_add_socket_from_template(struct bNodeTree *ntree, struc
dval->max = stemp->max;
break;
}
- case SOCK_RGBA: {
+ case SOCK_RGBA:
+ {
bNodeSocketValueRGBA *dval = sock->default_value;
dval->value[0] = stemp->val1;
dval->value[1] = stemp->val2;
@@ -202,7 +207,8 @@ void node_socket_init_default_value(bNodeSocket *sock)
return; /* already initialized */
switch (type) {
- case SOCK_FLOAT: {
+ case SOCK_FLOAT:
+ {
bNodeSocketValueFloat *dval = MEM_callocN(sizeof(bNodeSocketValueFloat), "node socket value float");
dval->subtype = subtype;
dval->value = 0.0f;
@@ -212,7 +218,8 @@ void node_socket_init_default_value(bNodeSocket *sock)
sock->default_value = dval;
break;
}
- case SOCK_INT: {
+ case SOCK_INT:
+ {
bNodeSocketValueInt *dval = MEM_callocN(sizeof(bNodeSocketValueInt), "node socket value int");
dval->subtype = subtype;
dval->value = 0;
@@ -222,14 +229,16 @@ void node_socket_init_default_value(bNodeSocket *sock)
sock->default_value = dval;
break;
}
- case SOCK_BOOLEAN: {
+ case SOCK_BOOLEAN:
+ {
bNodeSocketValueBoolean *dval = MEM_callocN(sizeof(bNodeSocketValueBoolean), "node socket value bool");
dval->value = false;
sock->default_value = dval;
break;
}
- case SOCK_VECTOR: {
+ case SOCK_VECTOR:
+ {
static float default_value[] = { 0.0f, 0.0f, 0.0f };
bNodeSocketValueVector *dval = MEM_callocN(sizeof(bNodeSocketValueVector), "node socket value vector");
dval->subtype = subtype;
@@ -240,7 +249,8 @@ void node_socket_init_default_value(bNodeSocket *sock)
sock->default_value = dval;
break;
}
- case SOCK_RGBA: {
+ case SOCK_RGBA:
+ {
static float default_value[] = { 0.0f, 0.0f, 0.0f, 1.0f };
bNodeSocketValueRGBA *dval = MEM_callocN(sizeof(bNodeSocketValueRGBA), "node socket value color");
copy_v4_v4(dval->value, default_value);
@@ -248,7 +258,8 @@ void node_socket_init_default_value(bNodeSocket *sock)
sock->default_value = dval;
break;
}
- case SOCK_STRING: {
+ case SOCK_STRING:
+ {
bNodeSocketValueString *dval = MEM_callocN(sizeof(bNodeSocketValueString), "node socket value string");
dval->subtype = subtype;
dval->value[0] = '\0';
@@ -271,37 +282,43 @@ void node_socket_copy_default_value(bNodeSocket *to, bNodeSocket *from)
node_socket_init_default_value(to);
switch (from->typeinfo->type) {
- case SOCK_FLOAT: {
+ case SOCK_FLOAT:
+ {
bNodeSocketValueFloat *toval = to->default_value;
bNodeSocketValueFloat *fromval = from->default_value;
*toval = *fromval;
break;
}
- case SOCK_INT: {
+ case SOCK_INT:
+ {
bNodeSocketValueInt *toval = to->default_value;
bNodeSocketValueInt *fromval = from->default_value;
*toval = *fromval;
break;
}
- case SOCK_BOOLEAN: {
+ case SOCK_BOOLEAN:
+ {
bNodeSocketValueBoolean *toval = to->default_value;
bNodeSocketValueBoolean *fromval = from->default_value;
*toval = *fromval;
break;
}
- case SOCK_VECTOR: {
+ case SOCK_VECTOR:
+ {
bNodeSocketValueVector *toval = to->default_value;
bNodeSocketValueVector *fromval = from->default_value;
*toval = *fromval;
break;
}
- case SOCK_RGBA: {
+ case SOCK_RGBA:
+ {
bNodeSocketValueRGBA *toval = to->default_value;
bNodeSocketValueRGBA *fromval = from->default_value;
*toval = *fromval;
break;
}
- case SOCK_STRING: {
+ case SOCK_STRING:
+ {
bNodeSocketValueString *toval = to->default_value;
bNodeSocketValueString *fromval = from->default_value;
*toval = *fromval;
@@ -334,21 +351,24 @@ static void standard_node_socket_interface_verify_socket(bNodeTree *UNUSED(ntree
node_socket_init_default_value(sock);
switch (stemp->typeinfo->type) {
- case SOCK_FLOAT: {
+ case SOCK_FLOAT:
+ {
bNodeSocketValueFloat *toval = sock->default_value;
bNodeSocketValueFloat *fromval = stemp->default_value;
toval->min = fromval->min;
toval->max = fromval->max;
break;
}
- case SOCK_INT: {
+ case SOCK_INT:
+ {
bNodeSocketValueInt *toval = sock->default_value;
bNodeSocketValueInt *fromval = stemp->default_value;
toval->min = fromval->min;
toval->max = fromval->max;
break;
}
- case SOCK_VECTOR: {
+ case SOCK_VECTOR:
+ {
bNodeSocketValueVector *toval = sock->default_value;
bNodeSocketValueVector *fromval = stemp->default_value;
toval->min = fromval->min;
diff --git a/source/blender/nodes/shader/nodes/node_shader_math.c b/source/blender/nodes/shader/nodes/node_shader_math.c
index b1a27f194cc..b0570a7d673 100644
--- a/source/blender/nodes/shader/nodes/node_shader_math.c
+++ b/source/blender/nodes/shader/nodes/node_shader_math.c
@@ -64,32 +64,32 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
out[0]->vec[0] = 0.0;
else
out[0]->vec[0] = in[0]->vec[0] / in[1]->vec[0];
+ break;
}
- break;
case 4: /* Sine */
{
if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */
out[0]->vec[0] = sin(in[0]->vec[0]);
else
out[0]->vec[0] = sin(in[1]->vec[0]);
+ break;
}
- break;
case 5: /* Cosine */
{
if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */
out[0]->vec[0] = cos(in[0]->vec[0]);
else
out[0]->vec[0] = cos(in[1]->vec[0]);
+ break;
}
- break;
case 6: /* Tangent */
{
if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */
out[0]->vec[0] = tan(in[0]->vec[0]);
else
out[0]->vec[0] = tan(in[1]->vec[0]);
+ break;
}
- break;
case 7: /* Arc-Sine */
{
if (in[0]->hasinput || !in[1]->hasinput) { /* This one only takes one input, so we've got to choose. */
@@ -106,8 +106,8 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
else
out[0]->vec[0] = 0.0;
}
+ break;
}
- break;
case 8: /* Arc-Cosine */
{
if (in[0]->hasinput || !in[1]->hasinput) { /* This one only takes one input, so we've got to choose. */
@@ -124,16 +124,16 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
else
out[0]->vec[0] = 0.0;
}
+ break;
}
- break;
case 9: /* Arc-Tangent */
{
if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */
out[0]->vec[0] = atan(in[0]->vec[0]);
else
out[0]->vec[0] = atan(in[1]->vec[0]);
+ break;
}
- break;
case 10: /* Power */
{
/* Only raise negative numbers by full integers */
@@ -152,8 +152,8 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
}
}
+ break;
}
- break;
case 11: /* Logarithm */
{
/* Don't want any imaginary numbers... */
@@ -161,56 +161,56 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
out[0]->vec[0] = log(in[0]->vec[0]) / log(in[1]->vec[0]);
else
out[0]->vec[0] = 0.0;
+ break;
}
- break;
case 12: /* Minimum */
{
if (in[0]->vec[0] < in[1]->vec[0])
out[0]->vec[0] = in[0]->vec[0];
else
out[0]->vec[0] = in[1]->vec[0];
+ break;
}
- break;
case 13: /* Maximum */
{
if (in[0]->vec[0] > in[1]->vec[0])
out[0]->vec[0] = in[0]->vec[0];
else
out[0]->vec[0] = in[1]->vec[0];
+ break;
}
- break;
case 14: /* Round */
{
if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */
out[0]->vec[0] = (in[0]->vec[0] < 0) ? (int)(in[0]->vec[0] - 0.5f) : (int)(in[0]->vec[0] + 0.5f);
else
out[0]->vec[0] = (in[1]->vec[0] < 0) ? (int)(in[1]->vec[0] - 0.5f) : (int)(in[1]->vec[0] + 0.5f);
+ break;
}
- break;
case 15: /* Less Than */
{
if (in[0]->vec[0] < in[1]->vec[0])
out[0]->vec[0] = 1.0f;
else
out[0]->vec[0] = 0.0f;
+ break;
}
- break;
case 16: /* Greater Than */
{
if (in[0]->vec[0] > in[1]->vec[0])
out[0]->vec[0] = 1.0f;
else
out[0]->vec[0] = 0.0f;
+ break;
}
- break;
case 17: /* Modulo */
{
if (in[1]->vec[0] == 0.0f)
out[0]->vec[0] = 0.0f;
else
out[0]->vec[0] = fmod(in[0]->vec[0], in[1]->vec[0]);
+ break;
}
- break;
}
}
diff --git a/source/blender/nodes/shader/nodes/node_shader_particle_info.c b/source/blender/nodes/shader/nodes/node_shader_particle_info.c
index dc98b7d5f63..05f7301776f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_particle_info.c
+++ b/source/blender/nodes/shader/nodes/node_shader_particle_info.c
@@ -39,7 +39,7 @@ static bNodeSocketTemplate outputs[] = {
{ SOCK_VECTOR, 0, "Velocity" },
{ SOCK_VECTOR, 0, "Angular Velocity" },
{ -1, 0, "" }
- };
+};
/* node type definition */
void register_node_type_sh_particle_info(void)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 13:58:59 +0300