diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 4 | ||||
| -rw-r--r-- | source/blender/nodes/CMP_node.h | 1 | ||||
| -rw-r--r-- | source/blender/nodes/intern/CMP_nodes/CMP_crop.c | 119 | ||||
| -rw-r--r-- | source/blender/src/drawnode.c | 55 |
6 files changed, 179 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 8cd189d0eea..e4ddc089a86 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -302,6 +302,7 @@ void set_node_shader_lamp_loop(void (*lamp_loop_func)(struct ShadeInput *, str #define CMP_NODE_GAMMA 250 #define CMP_NODE_INVERT 251 #define CMP_NODE_NORMALIZE 252 +#define CMP_NODE_CROP 253 #define CMP_NODE_GLARE 301 #define CMP_NODE_TONEMAP 302 diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 49e4269ac94..651115b7180 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -2363,6 +2363,7 @@ static void registerCompositNodes(ListBase *ntypelist) 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); diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 40ceb9f0c46..5f20939fc23 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -214,6 +214,10 @@ typedef struct NodeChroma { float key[4]; } NodeChroma; +typedef struct NodeTwoXYs { + short x1, x2, y1, y2; +} NodeTwoXYs; + typedef struct NodeGeometry { char uvname[32]; char colname[32]; diff --git a/source/blender/nodes/CMP_node.h b/source/blender/nodes/CMP_node.h index 14cb7b2f2ae..4b7e721ca57 100644 --- a/source/blender/nodes/CMP_node.h +++ b/source/blender/nodes/CMP_node.h @@ -94,6 +94,7 @@ extern bNodeType cmp_node_translate; extern bNodeType cmp_node_rotate; extern bNodeType cmp_node_scale; extern bNodeType cmp_node_flip; +extern bNodeType cmp_node_crop; extern bNodeType cmp_node_displace; extern bNodeType cmp_node_mapuv; diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_crop.c b/source/blender/nodes/intern/CMP_nodes/CMP_crop.c new file mode 100644 index 00000000000..f3a00dec084 --- /dev/null +++ b/source/blender/nodes/intern/CMP_nodes/CMP_crop.c @@ -0,0 +1,119 @@ +/** + * + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2006 Blender Foundation. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): Juho Vepsäläinen + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#include "../CMP_util.h" + +/* **************** Crop ******************** */ + +static bNodeSocketType cmp_node_crop_in[]= { + { SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f}, + { -1, 0, "" } +}; +static bNodeSocketType cmp_node_crop_out[]= { + { SOCK_RGBA, 0, "Image", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f}, + { -1, 0, "" } +}; + +static void node_composit_exec_crop(void *data, bNode *node, bNodeStack **in, bNodeStack **out) +{ + if(in[0]->data) { + NodeTwoXYs *ntxy= node->storage; + CompBuf *cbuf= in[0]->data; + CompBuf *stackbuf; + int x, y; + float *srcfp, *outfp; + rcti outputrect; + + /* check input image size */ + if(cbuf->x <= ntxy->x1 + 1) + ntxy->x1= cbuf->x - 1; + + if(cbuf->y <= ntxy->y1 + 1) + ntxy->y1= cbuf->y - 1; + + if(cbuf->x <= ntxy->x2 + 1) + ntxy->x2= cbuf->x - 1; + + if(cbuf->y <= ntxy->y2 + 1) + ntxy->y2= cbuf->y - 1; + + /* figure out the minimums and maximums */ + outputrect.xmax=MAX2(ntxy->x1, ntxy->x2) + 1; + outputrect.xmin=MIN2(ntxy->x1, ntxy->x2); + outputrect.ymax=MAX2(ntxy->y1, ntxy->y2) + 1; + outputrect.ymin=MIN2(ntxy->y1, ntxy->y2); + + if(node->custom1) { + /* this option crops the image size too */ + stackbuf= get_cropped_compbuf(&outputrect, cbuf->rect, cbuf->x, cbuf->y, cbuf->type); + } + else { + /* this option won't crop the size of the image as well */ + /* allocate memory for the output image */ + stackbuf = alloc_compbuf(cbuf->x, cbuf->y, cbuf->type, 1); + + /* select the cropped part of the image and set it to the output */ + for(y=outputrect.ymin; y<outputrect.ymax; y++){ + srcfp= cbuf->rect + (y * cbuf->x + outputrect.xmin) * cbuf->type; + outfp= stackbuf->rect + (y * stackbuf->x + outputrect.xmin) * stackbuf->type; + for(x=outputrect.xmin; x<outputrect.xmax; x++, outfp+= stackbuf->type, srcfp+= cbuf->type) + memcpy(outfp, srcfp, sizeof(float)*stackbuf->type); + } + } + + out[0]->data= stackbuf; + } +} + +static void node_composit_init_crop(bNode* node) +{ + NodeTwoXYs *nxy= MEM_callocN(sizeof(NodeTwoXYs), "node xy data"); + node->storage= nxy; + nxy->x1= 0; + nxy->x2= 0; + nxy->y1= 0; + nxy->y2= 0; +} + +bNodeType cmp_node_crop= { + /* *next,*prev */ NULL, NULL, + /* type code */ CMP_NODE_CROP, + /* name */ "Crop", + /* width+range */ 140, 100, 320, + /* class+opts */ NODE_CLASS_DISTORT, NODE_OPTIONS, + /* input sock */ cmp_node_crop_in, + /* output sock */ cmp_node_crop_out, + /* storage */ "NodeTwoXYs", + /* execfunc */ node_composit_exec_crop, + /* butfunc */ NULL, + /* initfunc */ node_composit_init_crop, + /* freestoragefunc */ node_free_standard_storage, + /* copystoragefunc */ node_copy_standard_storage, + /* id */ NULL +}; diff --git a/source/blender/src/drawnode.c b/source/blender/src/drawnode.c index 78c36d97746..256633524e4 100644 --- a/source/blender/src/drawnode.c +++ b/source/blender/src/drawnode.c @@ -1330,6 +1330,50 @@ static int node_composit_buts_flip(uiBlock *block, bNodeTree *ntree, bNode *node return 20; } +static int node_composit_buts_crop(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) +{ + if(block) { + NodeTwoXYs *ntxy= node->storage; + uiBut *bt; + char elementheight = 19; + short dx= (butr->xmax-butr->xmin)/2; + short dy= butr->ymax - elementheight; + short xymin= 0, xymax= 10000; + + uiBlockBeginAlign(block); + + /* crop image size toggle */ + uiDefButS(block, TOG, B_NODE_EXEC+node->nr, "Crop Image Size", + butr->xmin, dy, dx*2, elementheight, + &node->custom1, 0, 0, 0, 0, "Crop the size of the input image."); + + dy-=elementheight; + + /* x1 */ + bt=uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "X1:", + butr->xmin, dy, dx, elementheight, + &ntxy->x1, xymin, xymax, 0, 0, ""); + /* y1 */ + bt=uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "Y1:", + butr->xmin+dx, dy, dx, elementheight, + &ntxy->y1, xymin, xymax, 0, 0, ""); + + dy-=elementheight; + + /* x2 */ + bt=uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "X2:", + butr->xmin, dy, dx, elementheight, + &ntxy->x2, xymin, xymax, 0, 0, ""); + /* y2 */ + bt=uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "Y2:", + butr->xmin+dx, dy, dx, elementheight, + &ntxy->y2, xymin, xymax, 0, 0, ""); + + uiBlockEndAlign(block); + } + return 60; +} + static int node_composit_buts_splitviewer(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) { if(block) { @@ -1758,6 +1802,9 @@ static void node_composit_set_butfunc(bNodeType *ntype) case CMP_NODE_VALTORGB: ntype->butfunc= node_buts_valtorgb; break; + case CMP_NODE_CROP: + ntype->butfunc= node_composit_buts_crop; + break; case CMP_NODE_BLUR: ntype->butfunc= node_composit_buts_blur; break; @@ -2132,8 +2179,12 @@ static void node_update(bNode *node) node->prvr.xmin+= 0.5*dx; node->prvr.xmax-= 0.5*dx; } - + dy= node->prvr.ymin - NODE_DYS/2; + + /* make sure that maximums are bigger or equal to minimums */ + if(node->prvr.xmax < node->prvr.xmin) SWAP(float, node->prvr.xmax, node->prvr.xmin); + if(node->prvr.ymax < node->prvr.ymin) SWAP(float, node->prvr.ymax, node->prvr.ymin); } else { float oldh= node->prvr.ymax - node->prvr.ymin; @@ -2145,7 +2196,7 @@ static void node_update(bNode *node) dy= node->prvr.ymin - NODE_DYS/2; } } - + /* XXX ugly hack, typeinfo for group is generated */ if(node->type == NODE_GROUP) node->typeinfo->butfunc= node_buts_group; |