[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32703] branches/particles-2010/source/ blender: Renamed bNodeSocketType to bNodeSocketDefinition.
Lukas Toenne
lukas.toenne at googlemail.com
Mon Oct 25 16:12:44 CEST 2010
Revision: 32703
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32703
Author: lukastoenne
Date: 2010-10-25 16:12:44 +0200 (Mon, 25 Oct 2010)
Log Message:
-----------
Renamed bNodeSocketType to bNodeSocketDefinition. This struct is not directly related to the actual socket type of socket (value, vector, color, etc), but is now a mere helper struct for static socket initialization. It's not part of DNA or RNA, so no risk of breaking anything. The bNodeSocketType struct will instead be used to collect info about actual socket types, from ui names and pin colors to callbacks and conversion functions (depending on tree type).
Modified Paths:
--------------
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_alphaOver.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_bilateralblur.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_blur.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_brightness.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_channelMatte.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_chromaMatte.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_colorMatte.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_colorSpill.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_colorbalance.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_composite.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_crop.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_curves.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_defocus.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_diffMatte.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_dilate.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_directionalblur.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_displace.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_distanceMatte.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_filter.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_flip.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_gamma.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_glare.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_hueSatVal.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_huecorrect.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_idMask.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_image.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_invert.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_lensdist.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_levels.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_lummaMatte.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_mapUV.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_mapValue.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_math.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_mixrgb.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_normal.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_normalize.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_outputFile.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_premulkey.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_rgb.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_rotate.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_scale.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_sepcombHSVA.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_sepcombRGBA.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_sepcombYCCA.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_sepcombYUVA.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_setalpha.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_splitViewer.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_texture.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_tonemap.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_translate.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_valToRgb.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_value.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_vecBlur.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_viewer.c
branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_zcombine.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_camera.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_curves.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_dynamic.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_geom.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_hueSatVal.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_invert.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_mapping.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_material.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_math.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_mixRgb.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_normal.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_output.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_rgb.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_sepcombRGB.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_squeeze.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_texture.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_valToRgb.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_value.c
branches/particles-2010/source/blender/nodes/intern/shader/nodes/SHD_vectMath.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_for_group.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_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_timestep.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_vectormath.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_while.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_at.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_bricks.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_checker.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_compose.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_coord.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_curves.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_decompose.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_distance.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_hueSatVal.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_image.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_invert.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_math.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_mixRgb.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_output.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_proc.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_rotate.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_scale.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_texture.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_translate.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_valToNor.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_valToRgb.c
branches/particles-2010/source/blender/nodes/intern/texture/nodes/TEX_viewer.c
Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h 2010-10-25 13:37:49 UTC (rev 32702)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h 2010-10-25 14:12:44 UTC (rev 32703)
@@ -79,12 +79,12 @@
/* ************** NODE TYPE DEFINITIONS ***** */
-typedef struct bNodeSocketType {
+typedef struct bNodeSocketDefinition {
int type, limit;
char *name;
float val1, val2, val3, val4; /* default alloc value for inputs */
float min, max; /* default range for inputs */
-} bNodeSocketType;
+} bNodeSocketDefinition;
typedef struct bNodeType {
void *next,*prev;
@@ -93,7 +93,7 @@
float width, minwidth, maxwidth;
short nclass, flag;
- bNodeSocketType *inputs, *outputs;
+ bNodeSocketDefinition *inputs, *outputs;
char storagename[64]; /* struct name for DNA */
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/node.c 2010-10-25 13:37:49 UTC (rev 32702)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c 2010-10-25 14:12:44 UTC (rev 32703)
@@ -955,30 +955,30 @@
/* ************** Add stuff ********** */
void nodeAddSocketsFromType(bNode *node, bNodeType *ntype)
{
- bNodeSocketType *stype;
+ bNodeSocketDefinition *sockdef;
bNodeSocket *sock;
float default_value[4];
if(ntype->inputs) {
- stype= ntype->inputs;
- while(stype->type != -1) {
- default_value[0] = stype->val1;
- default_value[1] = stype->val2;
- default_value[2] = stype->val3;
- default_value[3] = stype->val4;
- sock = nodeAddInputSocket(node, stype->name, stype->type, default_value, stype->min, stype->max);
- stype++;
+ sockdef= ntype->inputs;
+ while(sockdef->type != -1) {
+ default_value[0] = sockdef->val1;
+ default_value[1] = sockdef->val2;
+ default_value[2] = sockdef->val3;
+ default_value[3] = sockdef->val4;
+ sock = nodeAddInputSocket(node, sockdef->name, sockdef->type, default_value, sockdef->min, sockdef->max);
+ sockdef++;
}
}
if(ntype->outputs) {
- stype= ntype->outputs;
- while(stype->type != -1) {
- default_value[0] = stype->val1;
- default_value[1] = stype->val2;
- default_value[2] = stype->val3;
- default_value[3] = stype->val4;
- sock = nodeAddOutputSocket(node, stype->name, stype->type, default_value, stype->min, stype->max);
- stype++;
+ sockdef= ntype->outputs;
+ while(sockdef->type != -1) {
+ default_value[0] = sockdef->val1;
+ default_value[1] = sockdef->val2;
+ default_value[2] = sockdef->val3;
+ default_value[3] = sockdef->val4;
+ sock = nodeAddOutputSocket(node, sockdef->name, sockdef->type, default_value, sockdef->min, sockdef->max);
+ sockdef++;
}
}
}
@@ -2411,18 +2411,18 @@
if(ntype->type==NODE_DYNAMIC && ntype->id!=NULL) {
BLI_remlink(list, ntype);
if(ntype->inputs) {
- bNodeSocketType *sock= ntype->inputs;
- while(sock->type!=-1) {
- MEM_freeN(sock->name);
- sock++;
+ bNodeSocketDefinition *sockdef= ntype->inputs;
+ while(sockdef->type!=-1) {
+ MEM_freeN(sockdef->name);
+ sockdef++;
}
MEM_freeN(ntype->inputs);
}
if(ntype->outputs) {
- bNodeSocketType *sock= ntype->outputs;
- while(sock->type!=-1) {
- MEM_freeN(sock->name);
- sock++;
+ bNodeSocketDefinition *sockdef= ntype->outputs;
+ while(sockdef->type!=-1) {
+ MEM_freeN(sockdef->name);
+ sockdef++;
}
MEM_freeN(ntype->outputs);
}
Modified: branches/particles-2010/source/blender/makesdna/DNA_node_types.h
===================================================================
--- branches/particles-2010/source/blender/makesdna/DNA_node_types.h 2010-10-25 13:37:49 UTC (rev 32702)
+++ branches/particles-2010/source/blender/makesdna/DNA_node_types.h 2010-10-25 14:12:44 UTC (rev 32703)
@@ -39,7 +39,7 @@
struct SpaceNode;
struct bNodeLink;
struct bNodeType;
-struct bNodeSocketType;
+struct bNodeSocketDefinition;
struct bNodeGroup;
struct AnimData;
struct bGPdata;
Modified: branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_alphaOver.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_alphaOver.c 2010-10-25 13:37:49 UTC (rev 32702)
+++ branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_alphaOver.c 2010-10-25 14:12:44 UTC (rev 32703)
@@ -30,13 +30,13 @@
#include "../CMP_util.h"
/* **************** ALPHAOVER ******************** */
-static bNodeSocketType cmp_node_alphaover_in[]= {
+static bNodeSocketDefinition cmp_node_alphaover_in[]= {
{ SOCK_VALUE, 1, "Fac", 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f},
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
{ -1, 0, "" }
};
-static bNodeSocketType cmp_node_alphaover_out[]= {
+static bNodeSocketDefinition cmp_node_alphaover_out[]= {
{ SOCK_RGBA, 0, "Image", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
{ -1, 0, "" }
};
Modified: branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_bilateralblur.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_bilateralblur.c 2010-10-25 13:37:49 UTC (rev 32702)
+++ branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_bilateralblur.c 2010-10-25 14:12:44 UTC (rev 32703)
@@ -29,13 +29,13 @@
#include "../CMP_util.h"
/* **************** BILATERALBLUR ******************** */
-static bNodeSocketType cmp_node_bilateralblur_in[]= {
+static bNodeSocketDefinition cmp_node_bilateralblur_in[]= {
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
{ SOCK_RGBA, 1, "Determinator", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
{ -1, 0, "" }
};
-static bNodeSocketType cmp_node_bilateralblur_out[]= {
+static bNodeSocketDefinition cmp_node_bilateralblur_out[]= {
{ SOCK_RGBA, 0, "Image", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
{ -1, 0, "" }
};
Modified: branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_blur.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_blur.c 2010-10-25 13:37:49 UTC (rev 32702)
+++ branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_blur.c 2010-10-25 14:12:44 UTC (rev 32703)
@@ -31,12 +31,12 @@
#include "../CMP_util.h"
/* **************** BLUR ******************** */
-static bNodeSocketType cmp_node_blur_in[]= {
+static bNodeSocketDefinition cmp_node_blur_in[]= {
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
{ SOCK_VALUE, 1, "Size", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
{ -1, 0, "" }
};
-static bNodeSocketType cmp_node_blur_out[]= {
+static bNodeSocketDefinition cmp_node_blur_out[]= {
{ SOCK_RGBA, 0, "Image", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
{ -1, 0, "" }
};
Modified: branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_brightness.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_brightness.c 2010-10-25 13:37:49 UTC (rev 32702)
+++ branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_brightness.c 2010-10-25 14:12:44 UTC (rev 32703)
@@ -33,13 +33,13 @@
/* **************** Brigh and contrsast ******************** */
-static bNodeSocketType cmp_node_brightcontrast_in[]= {
+static bNodeSocketDefinition cmp_node_brightcontrast_in[]= {
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
{ SOCK_VALUE, 1, "Bright", 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f},
{ SOCK_VALUE, 1, "Contrast", 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f},
{ -1, 0, "" }
};
-static bNodeSocketType cmp_node_brightcontrast_out[]= {
+static bNodeSocketDefinition cmp_node_brightcontrast_out[]= {
{ SOCK_RGBA, 0, "Image", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
{ -1, 0, "" }
};
Modified: branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_channelMatte.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_channelMatte.c 2010-10-25 13:37:49 UTC (rev 32702)
+++ branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_channelMatte.c 2010-10-25 14:12:44 UTC (rev 32703)
@@ -31,12 +31,12 @@
/* ******************* Channel Matte Node ********************************* */
-static bNodeSocketType cmp_node_channel_matte_in[]={
+static bNodeSocketDefinition cmp_node_channel_matte_in[]={
{SOCK_RGBA,1,"Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
{-1,0,""}
};
-static bNodeSocketType cmp_node_channel_matte_out[]={
+static bNodeSocketDefinition cmp_node_channel_matte_out[]={
{SOCK_RGBA,0,"Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
{SOCK_VALUE,0,"Matte",0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
{-1,0,""}
Modified: branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_chromaMatte.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_chromaMatte.c 2010-10-25 13:37:49 UTC (rev 32702)
+++ branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_chromaMatte.c 2010-10-25 14:12:44 UTC (rev 32703)
@@ -30,13 +30,13 @@
#include "../CMP_util.h"
/* ******************* Chroma Key ********************************************************** */
-static bNodeSocketType cmp_node_chroma_in[]={
+static bNodeSocketDefinition cmp_node_chroma_in[]={
{SOCK_RGBA,1,"Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
{SOCK_RGBA,1,"Key Color", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
{-1,0,""}
};
-static bNodeSocketType cmp_node_chroma_out[]={
+static bNodeSocketDefinition cmp_node_chroma_out[]={
{SOCK_RGBA,0,"Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
{SOCK_VALUE,0,"Matte",0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
{-1,0,""}
Modified: branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_colorMatte.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list