[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32395] branches/particles-2010/source/ blender: cleaned up node categories for simulation nodes, fixed the pass node
Lukas Toenne
lukas.toenne at googlemail.com
Sun Oct 10 11:24:24 CEST 2010
Revision: 32395
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32395
Author: lukastoenne
Date: 2010-10-10 11:24:24 +0200 (Sun, 10 Oct 2010)
Log Message:
-----------
cleaned up node categories for simulation nodes, fixed the pass node
Modified Paths:
--------------
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/editors/space_node/node_header.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_add_particle.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_add_particle_force.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_debugprint.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_filter.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_for.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_get_data.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_if.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_math.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_particle_dynamics.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_pass.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_program.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_random.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_set_data.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_subprogram.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_vector_compose.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_vector_decompose.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_while.c
Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h 2010-10-10 08:48:03 UTC (rev 32394)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h 2010-10-10 09:24:24 UTC (rev 32395)
@@ -152,11 +152,13 @@
#define NODE_CLASS_MATTE 9
#define NODE_CLASS_DISTORT 10
#define NODE_CLASS_OP_DYNAMIC 11
-#define NODE_CLASS_PATTERN 12
-#define NODE_CLASS_TEXTURE 13
-#define NODE_CLASS_SIMULATION 14
-#define NODE_CLASS_MATH 15
-#define NODE_CLASS_VECTORMATH 16
+#define NODE_CLASS_PATTERN 12
+#define NODE_CLASS_TEXTURE 13
+#define NODE_CLASS_EXECUTION 14
+#define NODE_CLASS_DATA 15
+#define NODE_CLASS_MATH 16
+#define NODE_CLASS_VECTORMATH 17
+#define NODE_CLASS_PARTICLES 18
typedef void (*bNodeTreeCallback)(void *calldata, struct ID *owner_id, struct bNodeTree *ntree);
typedef struct bNodeTreeTypeInfo
Modified: branches/particles-2010/source/blender/editors/space_node/node_header.c
===================================================================
--- branches/particles-2010/source/blender/editors/space_node/node_header.c 2010-10-10 08:48:03 UTC (rev 32394)
+++ branches/particles-2010/source/blender/editors/space_node/node_header.c 2010-10-10 09:24:24 UTC (rev 32395)
@@ -188,11 +188,12 @@
uiItemMenuF(layout, "Group", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_GROUP));
}
else if(snode->treetype==NTREE_SIMULATION) {
+ uiItemMenuF(layout, "Execution", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_EXECUTION));
+ uiItemMenuF(layout, "Data", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_DATA));
uiItemMenuF(layout, "Input", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_INPUT));
- uiItemMenuF(layout, "Output", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OUTPUT));
- uiItemMenuF(layout, "Simulation", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_SIMULATION));
uiItemMenuF(layout, "Math", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_MATH));
uiItemMenuF(layout, "Vector Math", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_VECTORMATH));
+ uiItemMenuF(layout, "Particles", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_PARTICLES));
uiItemMenuF(layout, "Group", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_GROUP));
}
}
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_add_particle.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_add_particle.c 2010-10-10 08:48:03 UTC (rev 32394)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_add_particle.c 2010-10-10 09:24:24 UTC (rev 32395)
@@ -52,7 +52,7 @@
/* type code */ SIM_NODE_ADDPARTICLE,
/* name */ "AddParticle",
/* width+range */ 140, 100, 320,
- /* class+opts */ NODE_CLASS_SIMULATION, NODE_OPTIONS,
+ /* class+opts */ NODE_CLASS_PARTICLES, NODE_OPTIONS,
/* input sock */ inputs,
/* output sock */ outputs,
/* storage */ "",
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_add_particle_force.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_add_particle_force.c 2010-10-10 08:48:03 UTC (rev 32394)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_add_particle_force.c 2010-10-10 09:24:24 UTC (rev 32395)
@@ -53,7 +53,7 @@
/* type code */ SIM_NODE_ADDPARTICLEFORCE,
/* name */ "AddParticleForce",
/* width+range */ 140, 100, 320,
- /* class+opts */ NODE_CLASS_SIMULATION, NODE_OPTIONS,
+ /* class+opts */ NODE_CLASS_PARTICLES, NODE_OPTIONS,
/* input sock */ inputs,
/* output sock */ outputs,
/* storage */ "",
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_debugprint.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_debugprint.c 2010-10-10 08:48:03 UTC (rev 32394)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_debugprint.c 2010-10-10 09:24:24 UTC (rev 32395)
@@ -45,7 +45,7 @@
/* type code */ SIM_NODE_DEBUGPRINT,
/* name */ "Debug Print",
/* width+range */ 140, 100, 320,
- /* class+opts */ NODE_CLASS_SIMULATION, 0,
+ /* class+opts */ NODE_CLASS_DATA, 0,
/* input sock */ inputs,
/* output sock */ outputs,
/* storage */ "",
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_filter.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_filter.c 2010-10-10 08:48:03 UTC (rev 32394)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_filter.c 2010-10-10 09:24:24 UTC (rev 32395)
@@ -49,7 +49,7 @@
/* type code */ SIM_NODE_FILTER,
/* name */ "Filter",
/* width+range */ 140, 100, 320,
- /* class+opts */ NODE_CLASS_SIMULATION, 0,
+ /* class+opts */ NODE_CLASS_DATA, 0,
/* input sock */ inputs,
/* output sock */ outputs,
/* storage */ "",
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_for.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_for.c 2010-10-10 08:48:03 UTC (rev 32394)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_for.c 2010-10-10 09:24:24 UTC (rev 32395)
@@ -60,7 +60,7 @@
/* type code */ SIM_NODE_FOR,
/* name */ "For",
/* width+range */ 140, 100, 320,
- /* class+opts */ NODE_CLASS_SIMULATION, 0,
+ /* class+opts */ NODE_CLASS_EXECUTION, 0,
/* input sock */ inputs,
/* output sock */ outputs,
/* storage */ "",
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_get_data.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_get_data.c 2010-10-10 08:48:03 UTC (rev 32394)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_get_data.c 2010-10-10 09:24:24 UTC (rev 32395)
@@ -367,7 +367,7 @@
/* type code */ SIM_NODE_GETDATA,
/* name */ "GetData",
/* width+range */ 140, 100, 320,
- /* class+opts */ NODE_CLASS_SIMULATION, NODE_OPTIONS,
+ /* class+opts */ NODE_CLASS_DATA, NODE_OPTIONS,
/* input sock */ inputs,
/* output sock */ outputs,
/* storage */ "NodeRNAData",
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_if.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_if.c 2010-10-10 08:48:03 UTC (rev 32394)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_if.c 2010-10-10 09:24:24 UTC (rev 32395)
@@ -46,31 +46,31 @@
{
int restype= node->outstack[0].type;
DynStr *source= sim_kernel_source_begin(node, NULL, 0, NULL);
- BLI_dynstr_appendf(source, "*OUTPUT0_FLOAT(get_global_id(0)) = (INPUT0_BOOL(get_global_id(0)) ? INPUT1_%s(get_global_id(0)) : INPUT2_%s(get_global_id(0)));\n", sim_get_typename(restype), sim_get_typename(restype));
+ BLI_dynstr_appendf(source, "*OUTPUT0_%s(get_global_id(0)) = (INPUT0_BOOL(get_global_id(0)) ? INPUT1_%s(get_global_id(0)) : INPUT2_%s(get_global_id(0)));\n", sim_get_typename(restype), sim_get_typename(restype), sim_get_typename(restype));
return sim_kernel_source_end(source);
}
-void kernel_float(int global_id, void **args, SimNodeStack *node)
+static void kernel_float(int global_id, void **args, SimNodeStack *node)
{
*SIM_OUTPUT_FLOAT(0, global_id) = (SIM_INPUT_BOOL(0, global_id) ? SIM_INPUT_FLOAT(1, global_id) : SIM_INPUT_FLOAT(2, global_id));
}
-void kernel_int(int global_id, void **args, SimNodeStack *node)
+static void kernel_int(int global_id, void **args, SimNodeStack *node)
{
*SIM_OUTPUT_INT(0, global_id) = (SIM_INPUT_BOOL(0, global_id) ? SIM_INPUT_INT(1, global_id) : SIM_INPUT_INT(2, global_id));
}
-void kernel_bool(int global_id, void **args, SimNodeStack *node)
+static void kernel_bool(int global_id, void **args, SimNodeStack *node)
{
*SIM_OUTPUT_BOOL(0, global_id) = (SIM_INPUT_BOOL(0, global_id) ? SIM_INPUT_BOOL(1, global_id) : SIM_INPUT_BOOL(2, global_id));
}
-void kernel_vector(int global_id, void **args, SimNodeStack *node)
+static void kernel_vector(int global_id, void **args, SimNodeStack *node)
{
copy_v3_v3(SIM_OUTPUT_VECTOR(0, global_id), (SIM_INPUT_BOOL(0, global_id) ? SIM_INPUT_VECTOR(1, global_id) : SIM_INPUT_VECTOR(2, global_id)));
}
-void kernel_rgba(int global_id, void **args, SimNodeStack *node)
+static void kernel_rgba(int global_id, void **args, SimNodeStack *node)
{
copy_v4_v4(SIM_OUTPUT_RGBA(0, global_id), (SIM_INPUT_BOOL(0, global_id) ? SIM_INPUT_RGBA(1, global_id) : SIM_INPUT_RGBA(2, global_id)));
}
@@ -127,7 +127,7 @@
/* type code */ SIM_NODE_IF,
/* name */ "If",
/* width+range */ 140, 100, 320,
- /* class+opts */ NODE_CLASS_SIMULATION, 0,
+ /* class+opts */ NODE_CLASS_EXECUTION, 0,
/* input sock */ inputs,
/* output sock */ outputs,
/* storage */ "",
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_math.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_math.c 2010-10-10 08:48:03 UTC (rev 32394)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_math.c 2010-10-10 09:24:24 UTC (rev 32395)
@@ -100,22 +100,22 @@
return sim_kernel_source_end(source);
}
-void node_add_float(int global_id, void **args, SimNodeStack *node)
+static void node_add_float(int global_id, void **args, SimNodeStack *node)
{
*SIM_OUTPUT_FLOAT(0, global_id) = SIM_INPUT_FLOAT(0, global_id) + SIM_INPUT_FLOAT(1, global_id);
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list