[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13565] trunk/blender/source/blender: AlphaOver node feature: "Premul" slider allows to mix between the
Ton Roosendaal
ton at blender.org
Mon Feb 4 19:37:40 CET 2008
Revision: 13565
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13565
Author: ton
Date: 2008-02-04 19:37:40 +0100 (Mon, 04 Feb 2008)
Log Message:
-----------
AlphaOver node feature: "Premul" slider allows to mix between the
using alpha as premul or nonpremul. Quite useful for brightness
tweaks.
Todo: version-patch this so ConvertPremul button goes away
Todo: make entire compositer accept non-premul by default... or both
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_node_types.h
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
trunk/blender/source/blender/src/drawnode.c
Modified: trunk/blender/source/blender/makesdna/DNA_node_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_node_types.h 2008-02-04 15:52:47 UTC (rev 13564)
+++ trunk/blender/source/blender/makesdna/DNA_node_types.h 2008-02-04 18:37:40 UTC (rev 13565)
@@ -238,6 +238,10 @@
short x1, x2, y1, y2;
} NodeTwoXYs;
+typedef struct NodeTwoFloats {
+ float x, y;
+} NodeTwoFloats;
+
typedef struct NodeGeometry {
char uvname[32];
char colname[32];
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c 2008-02-04 15:52:47 UTC (rev 13564)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c 2008-02-04 18:37:40 UTC (rev 13565)
@@ -47,16 +47,16 @@
if(over[3]<=0.0f) {
QUATCOPY(out, src);
}
- else if(*fac==1.0f && over[3]>=1.0f) {
+ else if(fac[0]==1.0f && over[3]>=1.0f) {
QUATCOPY(out, over);
}
else {
- float mul= 1.0f - *fac*over[3];
+ float mul= 1.0f - fac[0]*over[3];
- out[0]= (mul*src[0]) + *fac*over[0];
- out[1]= (mul*src[1]) + *fac*over[1];
- out[2]= (mul*src[2]) + *fac*over[2];
- out[3]= (mul*src[3]) + *fac*over[3];
+ out[0]= (mul*src[0]) + fac[0]*over[0];
+ out[1]= (mul*src[1]) + fac[0]*over[1];
+ out[2]= (mul*src[2]) + fac[0]*over[2];
+ out[3]= (mul*src[3]) + fac[0]*over[3];
}
}
@@ -67,7 +67,7 @@
if(over[3]<=0.0f) {
QUATCOPY(out, src);
}
- else if(*fac==1.0f && over[3]>=1.0f) {
+ else if(fac[0]==1.0f && over[3]>=1.0f) {
QUATCOPY(out, over);
}
else {
@@ -81,7 +81,32 @@
}
}
+/* result will be still premul, but the over part is premulled */
+static void do_alphaover_mixed(bNode *node, float *out, float *src, float *over, float *fac)
+{
+
+ if(over[3]<=0.0f) {
+ QUATCOPY(out, src);
+ }
+ else if(fac[0]==1.0f && over[3]>=1.0f) {
+ QUATCOPY(out, over);
+ }
+ else {
+ NodeTwoFloats *ntf= node->storage;
+ float addfac= 1.0f - ntf->x + over[3]*ntf->x;
+ float premul= fac[0]*addfac;
+ float mul= 1.0f - fac[0]*over[3];
+
+ out[0]= (mul*src[0]) + premul*over[0];
+ out[1]= (mul*src[1]) + premul*over[1];
+ out[2]= (mul*src[2]) + premul*over[2];
+ out[3]= (mul*src[3]) + fac[0]*over[3];
+ }
+}
+
+
+
static void node_composit_exec_alphaover(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
{
/* stack order in: col col */
@@ -97,8 +122,11 @@
/* make output size of input image */
CompBuf *cbuf= in[1]->data?in[1]->data:in[2]->data;
CompBuf *stackbuf= alloc_compbuf(cbuf->x, cbuf->y, CB_RGBA, 1); /* allocs */
+ NodeTwoFloats *ntf= node->storage;
- if(node->custom1)
+ if(ntf->x != 0.0f)
+ composit3_pixel_processor(node, stackbuf, in[1]->data, in[1]->vec, in[2]->data, in[2]->vec, in[0]->data, in[0]->vec, do_alphaover_mixed, CB_RGBA, CB_RGBA, CB_VAL);
+ else if(node->custom1)
composit3_pixel_processor(node, stackbuf, in[1]->data, in[1]->vec, in[2]->data, in[2]->vec, in[0]->data, in[0]->vec, do_alphaover_key, CB_RGBA, CB_RGBA, CB_VAL);
else
composit3_pixel_processor(node, stackbuf, in[1]->data, in[1]->vec, in[2]->data, in[2]->vec, in[0]->data, in[0]->vec, do_alphaover_premul, CB_RGBA, CB_RGBA, CB_VAL);
@@ -115,12 +143,12 @@
/* class+opts */ NODE_CLASS_OP_COLOR, NODE_OPTIONS,
/* input sock */ cmp_node_alphaover_in,
/* output sock */ cmp_node_alphaover_out,
- /* storage */ "",
+ /* storage */ "NodeTwoFloats",
/* execfunc */ node_composit_exec_alphaover,
/* butfunc */ NULL,
/* initfunc */ NULL,
- /* freestoragefunc */ NULL,
- /* copystoragefunc */ NULL,
+ /* freestoragefunc */ node_free_standard_storage,
+ /* copystoragefunc */ node_copy_standard_storage,
/* id */ NULL
};
Modified: trunk/blender/source/blender/src/drawnode.c
===================================================================
--- trunk/blender/source/blender/src/drawnode.c 2008-02-04 15:52:47 UTC (rev 13564)
+++ trunk/blender/source/blender/src/drawnode.c 2008-02-04 18:37:40 UTC (rev 13565)
@@ -1563,13 +1563,18 @@
static int node_composit_buts_alphaover(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
{
if(block) {
+ NodeTwoFloats *ntf= node->storage;
/* alpha type */
uiDefButS(block, TOG, B_NODE_EXEC+node->nr, "ConvertPremul",
+ butr->xmin, butr->ymin+19, butr->xmax-butr->xmin, 19,
+ &node->custom1, 0, 0, 0, 0, "");
+ /* mix factor */
+ uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "Premul: ",
butr->xmin, butr->ymin, butr->xmax-butr->xmin, 19,
- &node->custom1, 0, 0, 0, 0, "");
+ &ntf->x, 0.0f, 1.0f, 100, 0, "");
}
- return 19;
+ return 38;
}
static int node_composit_buts_hue_sat(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
More information about the Bf-blender-cvs
mailing list