Revision: 34712
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34712
Author: lukastoenne
Date: 2011-02-08 09:02:16 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
Finished the node type definition cleanup started in r34682. All static node
types should now use the node_type_* definition helpers to initialize their
bNodeType structs.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34682
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/nodes/CMP_node.h
trunk/blender/source/blender/nodes/SHD_node.h
trunk/blender/source/blender/nodes/TEX_node.h
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_normal.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_translate.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_value.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
trunk/blender/source/blender/nodes/intern/CMP_util.h
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_math.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_output.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_value.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_at.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
trunk/blender/source/blender/nodes/intern/TEX_util.h
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2011-02-08 06:22:06 UTC
(rev 34711)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2011-02-08 09:02:16 UTC
(rev 34712)
@@ -208,12 +208,12 @@
/* ************** COMMON NODES *************** */
/* Init a new node type struct with default values and callbacks */
-void node_type_init(struct bNodeType *ntype, int type, const
char *name, short nclass, short flag,
+void node_type_base(struct bNodeType *ntype, int type, const
char *name, short nclass, short flag,
struct
bNodeSocketType *inputs, struct bNodeSocketType *outputs);
void node_type_size(struct bNodeType *ntype, int width, int
minwidth, int maxwidth);
+void node_type_init(struct bNodeType *ntype, void
(*initfunc)(struct bNode *));
void node_type_storage(struct bNodeType *ntype,
const char
*storagename,
- void
(*initfunc)(struct bNode *),
void
(*freestoragefunc)(struct bNode *),
void
(*copystoragefunc)(struct bNode *, struct bNode *));
void node_type_exec(struct bNodeType *ntype, void
(*execfunc)(void *data, struct bNode *, struct bNodeStack **, struct bNodeStack
**));
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2011-02-08
06:22:06 UTC (rev 34711)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2011-02-08
09:02:16 UTC (rev 34712)
@@ -3245,7 +3245,7 @@
/* ************* node definition init ********** */
-void node_type_init(bNodeType *ntype, int type, const char *name, short
nclass, short flag,
+void node_type_base(bNodeType *ntype, int type, const char *name, short
nclass, short flag,
struct bNodeSocketType *inputs, struct
bNodeSocketType *outputs)
{
memset(ntype, 0, sizeof(bNodeType));
@@ -3264,6 +3264,11 @@
ntype->maxwidth = 320;
}
+void node_type_init(bNodeType *ntype, void (*initfunc)(struct bNode *))
+{
+ ntype->initfunc = initfunc;
+}
+
void node_type_size(struct bNodeType *ntype, int width, int minwidth, int
maxwidth)
{
ntype->width = width;
@@ -3271,10 +3276,12 @@
ntype->maxwidth = maxwidth;
}
-void node_type_storage(bNodeType *ntype, const char *storagename, void
(*initfunc)(struct bNode *), void (*freestoragefunc)(struct bNode *), void
(*copystoragefunc)(struct bNode *, struct bNode *))
+void node_type_storage(bNodeType *ntype, const char *storagename, void
(*freestoragefunc)(struct bNode *), void (*copystoragefunc)(struct bNode *,
struct bNode *))
{
- strncpy(ntype->storagename, storagename, sizeof(ntype->storagename));
- ntype->initfunc = initfunc;
+ if (storagename)
+ strncpy(ntype->storagename, storagename,
sizeof(ntype->storagename));
+ else
+ ntype->storagename[0] = '\0';
ntype->copystoragefunc = copystoragefunc;
ntype->freestoragefunc = freestoragefunc;
}
@@ -3316,146 +3323,146 @@
static void registerCompositNodes(ListBase *ntypelist)
{
nodeRegisterType(ntypelist, &node_group_typeinfo);
- nodeRegisterType(ntypelist, &cmp_node_rlayers);
- nodeRegisterType(ntypelist, &cmp_node_image);
- nodeRegisterType(ntypelist, &cmp_node_texture);
- nodeRegisterType(ntypelist, &cmp_node_value);
- nodeRegisterType(ntypelist, &cmp_node_rgb);
- nodeRegisterType(ntypelist, &cmp_node_curve_time);
+ register_node_type_cmp_rlayers(ntypelist);
+ register_node_type_cmp_image(ntypelist);
+ register_node_type_cmp_texture(ntypelist);
+ register_node_type_cmp_value(ntypelist);
+ register_node_type_cmp_rgb(ntypelist);
+ register_node_type_cmp_curve_time(ntypelist);
- nodeRegisterType(ntypelist, &cmp_node_composite);
- nodeRegisterType(ntypelist, &cmp_node_viewer);
- nodeRegisterType(ntypelist, &cmp_node_splitviewer);
- nodeRegisterType(ntypelist, &cmp_node_output_file);
- nodeRegisterType(ntypelist, &cmp_node_view_levels);
+ register_node_type_cmp_composite(ntypelist);
+ register_node_type_cmp_viewer(ntypelist);
+ register_node_type_cmp_splitviewer(ntypelist);
+ register_node_type_cmp_output_file(ntypelist);
+ register_node_type_cmp_view_levels(ntypelist);
- nodeRegisterType(ntypelist, &cmp_node_curve_rgb);
- nodeRegisterType(ntypelist, &cmp_node_mix_rgb);
- nodeRegisterType(ntypelist, &cmp_node_hue_sat);
- nodeRegisterType(ntypelist, &cmp_node_brightcontrast);
- nodeRegisterType(ntypelist, &cmp_node_gamma);
- nodeRegisterType(ntypelist, &cmp_node_invert);
- nodeRegisterType(ntypelist, &cmp_node_alphaover);
- nodeRegisterType(ntypelist, &cmp_node_zcombine);
- nodeRegisterType(ntypelist, &cmp_node_colorbalance);
- nodeRegisterType(ntypelist, &cmp_node_huecorrect);
+ register_node_type_cmp_curve_rgb(ntypelist);
+ register_node_type_cmp_mix_rgb(ntypelist);
+ register_node_type_cmp_hue_sat(ntypelist);
+ register_node_type_cmp_brightcontrast(ntypelist);
+ register_node_type_cmp_gamma(ntypelist);
+ register_node_type_cmp_invert(ntypelist);
+ register_node_type_cmp_alphaover(ntypelist);
+ register_node_type_cmp_zcombine(ntypelist);
+ register_node_type_cmp_colorbalance(ntypelist);
+ register_node_type_cmp_huecorrect(ntypelist);
- nodeRegisterType(ntypelist, &cmp_node_normal);
- nodeRegisterType(ntypelist, &cmp_node_curve_vec);
- nodeRegisterType(ntypelist, &cmp_node_map_value);
- nodeRegisterType(ntypelist, &cmp_node_normalize);
+ register_node_type_cmp_normal(ntypelist);
+ register_node_type_cmp_curve_vec(ntypelist);
+ register_node_type_cmp_map_value(ntypelist);
+ register_node_type_cmp_normalize(ntypelist);
- nodeRegisterType(ntypelist, &cmp_node_filter);
- nodeRegisterType(ntypelist, &cmp_node_blur);
- nodeRegisterType(ntypelist, &cmp_node_dblur);
- nodeRegisterType(ntypelist, &cmp_node_bilateralblur);
- nodeRegisterType(ntypelist, &cmp_node_vecblur);
- nodeRegisterType(ntypelist, &cmp_node_dilateerode);
- nodeRegisterType(ntypelist, &cmp_node_defocus);
+ register_node_type_cmp_filter(ntypelist);
+ register_node_type_cmp_blur(ntypelist);
+ register_node_type_cmp_dblur(ntypelist);
+ register_node_type_cmp_bilateralblur(ntypelist);
+ register_node_type_cmp_vecblur(ntypelist);
+ register_node_type_cmp_dilateerode(ntypelist);
+ register_node_type_cmp_defocus(ntypelist);
- nodeRegisterType(ntypelist, &cmp_node_valtorgb);
- nodeRegisterType(ntypelist, &cmp_node_rgbtobw);
- nodeRegisterType(ntypelist, &cmp_node_setalpha);
- nodeRegisterType(ntypelist, &cmp_node_idmask);
- nodeRegisterType(ntypelist, &cmp_node_math);
- nodeRegisterType(ntypelist, &cmp_node_seprgba);
- nodeRegisterType(ntypelist, &cmp_node_combrgba);
- nodeRegisterType(ntypelist, &cmp_node_sephsva);
- nodeRegisterType(ntypelist, &cmp_node_combhsva);
- nodeRegisterType(ntypelist, &cmp_node_sepyuva);
- nodeRegisterType(ntypelist, &cmp_node_combyuva);
- nodeRegisterType(ntypelist, &cmp_node_sepycca);
- nodeRegisterType(ntypelist, &cmp_node_combycca);
- nodeRegisterType(ntypelist, &cmp_node_premulkey);
+ register_node_type_cmp_valtorgb(ntypelist);
+ register_node_type_cmp_rgbtobw(ntypelist);
+ register_node_type_cmp_setalpha(ntypelist);
+ register_node_type_cmp_idmask(ntypelist);
+ register_node_type_cmp_math(ntypelist);
+ register_node_type_cmp_seprgba(ntypelist);
+ register_node_type_cmp_combrgba(ntypelist);
+ register_node_type_cmp_sephsva(ntypelist);
+ register_node_type_cmp_combhsva(ntypelist);
+ register_node_type_cmp_sepyuva(ntypelist);
+ register_node_type_cmp_combyuva(ntypelist);
+ register_node_type_cmp_sepycca(ntypelist);
+ register_node_type_cmp_combycca(ntypelist);
+ register_node_type_cmp_premulkey(ntypelist);
- nodeRegisterType(ntypelist, &cmp_node_diff_matte);
- nodeRegisterType(ntypelist, &cmp_node_distance_matte);
- nodeRegisterType(ntypelist, &cmp_node_chroma_matte);
- nodeRegisterType(ntypelist, &cmp_node_color_matte);
- nodeRegisterType(ntypelist, &cmp_node_channel_matte);
- nodeRegisterType(ntypelist, &cmp_node_color_spill);
- nodeRegisterType(ntypelist, &cmp_node_luma_matte);
+ register_node_type_cmp_diff_matte(ntypelist);
+ register_node_type_cmp_distance_matte(ntypelist);
+ register_node_type_cmp_chroma_matte(ntypelist);
+ register_node_type_cmp_color_matte(ntypelist);
+ register_node_type_cmp_channel_matte(ntypelist);
+ register_node_type_cmp_color_spill(ntypelist);
+ register_node_type_cmp_luma_matte(ntypelist);
- nodeRegisterType(ntypelist, &cmp_node_translate);
- nodeRegisterType(ntypelist, &cmp_node_rotate);
- nodeRegisterType(ntypelist, &cmp_node_scale);
- nodeRegisterType(ntypelist, &cmp_node_flip);
- nodeRegisterType(ntypelist, &cmp_node_crop);
- nodeRegisterType(ntypelist, &cmp_node_displace);
- nodeRegisterType(ntypelist, &cmp_node_mapuv);
- nodeRegisterType(ntypelist, &cmp_node_glare);
- nodeRegisterType(ntypelist, &cmp_node_tonemap);
- nodeRegisterType(ntypelist, &cmp_node_lensdist);
+ register_node_type_cmp_translate(ntypelist);
+ register_node_type_cmp_rotate(ntypelist);
+ register_node_type_cmp_scale(ntypelist);
+ register_node_type_cmp_flip(ntypelist);
+ register_node_type_cmp_crop(ntypelist);
+ register_node_type_cmp_displace(ntypelist);
+ register_node_type_cmp_mapuv(ntypelist);
+ register_node_type_cmp_glare(ntypelist);
+ register_node_type_cmp_tonemap(ntypelist);
+ register_node_type_cmp_lensdist(ntypelist);
}
static void registerShaderNodes(ListBase *ntypelist)
{
nodeRegisterType(ntypelist, &node_group_typeinfo);
- nodeRegisterType(ntypelist, &sh_node_output);
- nodeRegisterType(ntypelist, &sh_node_mix_rgb);
- nodeRegisterType(ntypelist, &sh_node_valtorgb);
- nodeRegisterType(ntypelist, &sh_node_rgbtobw);
+ register_node_type_sh_output(ntypelist);
+ register_node_type_sh_mix_rgb(ntypelist);
+ register_node_type_sh_valtorgb(ntypelist);
+ register_node_type_sh_rgbtobw(ntypelist);
register_node_type_sh_normal(ntypelist);
- nodeRegisterType(ntypelist, &sh_node_geom);
+ register_node_type_sh_geom(ntypelist);
register_node_type_sh_mapping(ntypelist);
- nodeRegisterType(ntypelist, &sh_node_curve_vec);
- nodeRegisterType(ntypelist, &sh_node_curve_rgb);
- nodeRegisterType(ntypelist, &sh_node_math);
- nodeRegisterType(ntypelist, &sh_node_vect_math);
- nodeRegisterType(ntypelist, &sh_node_squeeze);
- nodeRegisterType(ntypelist, &sh_node_camera);
- nodeRegisterType(ntypelist, &sh_node_material);
- nodeRegisterType(ntypelist, &sh_node_material_ext);
- nodeRegisterType(ntypelist, &sh_node_value);
- nodeRegisterType(ntypelist, &sh_node_rgb);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
