Jeroen Bakker
e814f2c71d
===== Situation before this patch ===== in the current situation inside the node editor there is a properties panel (press 'n'-key). This pabel displays some information about the node, backdrop and grease pencil. The UI of the property panel is typically vertical oriented. Nodes in the other hand are not oriented in a direction. Both area's are draw via the same draw function. With some nodes this will create not user-friendly UI. Try the color-balance for instance). The 3 color circles are drawn next to each other, it would be better to draw them below each other. When creating more complex nodes you don't want to display all handles in the node-panel and in the properties panel. For instance fine-tuning handles you only want to appear in the property panel to reduce place in the node itself. ===== Situation after this patch ===== This patch separates the draw functions of the property panel and the node panel. When no special draw function is created for the property panel, the draw function of the node will be used as 'fallback' ===== Impact ===== ==== BKE_node.h ==== add a new uifunc (called uifuncbut) to the bNodeType struct. The definition is the same as the uifunc. ==== node_buttons.c ==== if the uifuncbut is set, call it. currently calls the uifunc method ==== drawnode.c ==== static void node_composit_set_butfunc(bNodeType *ntype). set the uifuncbut function where needed. When at the end of the method uifuncbut is still empty, set uifuncbut to the uifunc. ===== Final note ===== ! PS. this is not limited to the compositor it also works for Materials and Textures ! ! PPS. For other branching creating their own node-tree. Please make sure that your uifuncbut is set NULL or a valid draw function !
175 lines
4.4 KiB
C
175 lines
4.4 KiB
C
/*
|
|
* $Id$
|
|
*
|
|
* ***** 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2009 Blender Foundation.
|
|
* All rights reserved.
|
|
*
|
|
*
|
|
* Contributor(s): Blender Foundation
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/** \file blender/editors/space_node/node_buttons.c
|
|
* \ingroup spnode
|
|
*/
|
|
|
|
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <math.h>
|
|
#include <float.h>
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "DNA_node_types.h"
|
|
#include "DNA_scene_types.h"
|
|
|
|
#include "BLI_math.h"
|
|
#include "BLI_blenlib.h"
|
|
#include "BLI_rand.h"
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "BKE_context.h"
|
|
#include "BKE_node.h"
|
|
#include "BKE_screen.h"
|
|
|
|
#include "WM_api.h"
|
|
#include "WM_types.h"
|
|
|
|
#include "RNA_access.h"
|
|
|
|
#include "ED_gpencil.h"
|
|
#include "ED_screen.h"
|
|
|
|
#include "UI_interface.h"
|
|
#include "UI_resources.h"
|
|
|
|
#include "node_intern.h" // own include
|
|
|
|
|
|
/* ******************* node space & buttons ************** */
|
|
#define B_NOP 1
|
|
#define B_REDR 2
|
|
|
|
static void do_node_region_buttons(bContext *C, void *UNUSED(arg), int event)
|
|
{
|
|
//SpaceNode *snode= CTX_wm_space_node(C);
|
|
|
|
switch(event) {
|
|
case B_REDR:
|
|
ED_area_tag_redraw(CTX_wm_area(C));
|
|
return; /* no notifier! */
|
|
}
|
|
}
|
|
|
|
/* poll callback for active node */
|
|
static int active_node_poll(const bContext *C, PanelType *UNUSED(pt))
|
|
{
|
|
SpaceNode *snode= CTX_wm_space_node(C);
|
|
|
|
// TODO: include check for whether there is an active node...
|
|
return (snode && snode->nodetree);
|
|
}
|
|
|
|
/* active node */
|
|
static void active_node_panel(const bContext *C, Panel *pa)
|
|
{
|
|
SpaceNode *snode= CTX_wm_space_node(C);
|
|
bNodeTree *ntree= (snode) ? snode->edittree : NULL;
|
|
bNode *node = (ntree) ? nodeGetActive(ntree) : NULL; // xxx... for editing group nodes
|
|
uiLayout *layout= pa->layout;
|
|
uiBlock *block;
|
|
PointerRNA ptr;
|
|
|
|
/* verify pointers, and create RNA pointer for the node */
|
|
if ELEM(NULL, ntree, node)
|
|
return;
|
|
//if (node->id) /* for group nodes */
|
|
// RNA_pointer_create(node->id, &RNA_Node, node, &ptr);
|
|
//else
|
|
RNA_pointer_create(&ntree->id, &RNA_Node, node, &ptr);
|
|
|
|
/* set update callback */
|
|
// xxx is this really needed
|
|
block= uiLayoutGetBlock(layout);
|
|
uiBlockSetHandleFunc(block, do_node_region_buttons, NULL);
|
|
|
|
/* draw this node's name, etc. */
|
|
uiItemR(layout, &ptr, "label", 0, NULL, ICON_NODE);
|
|
uiItemS(layout);
|
|
uiItemR(layout, &ptr, "name", 0, NULL, ICON_NODE);
|
|
uiItemS(layout);
|
|
|
|
/* draw this node's settings */
|
|
if (node->typeinfo && node->typeinfo->uifuncbut)
|
|
node->typeinfo->uifuncbut(layout, (bContext *)C, &ptr);
|
|
}
|
|
|
|
/* ******************* node buttons registration ************** */
|
|
|
|
void node_buttons_register(ARegionType *art)
|
|
{
|
|
PanelType *pt;
|
|
|
|
pt= MEM_callocN(sizeof(PanelType), "spacetype node panel active node");
|
|
strcpy(pt->idname, "NODE_PT_item");
|
|
strcpy(pt->label, "Active Node");
|
|
pt->draw= active_node_panel;
|
|
pt->poll= active_node_poll;
|
|
BLI_addtail(&art->paneltypes, pt);
|
|
|
|
pt= MEM_callocN(sizeof(PanelType), "spacetype node panel gpencil");
|
|
strcpy(pt->idname, "NODE_PT_gpencil");
|
|
strcpy(pt->label, "Grease Pencil");
|
|
pt->draw= gpencil_panel_standard;
|
|
BLI_addtail(&art->paneltypes, pt);
|
|
}
|
|
|
|
static int node_properties(bContext *C, wmOperator *UNUSED(op))
|
|
{
|
|
ScrArea *sa= CTX_wm_area(C);
|
|
ARegion *ar= node_has_buttons_region(sa);
|
|
|
|
if(ar)
|
|
ED_region_toggle_hidden(C, ar);
|
|
|
|
return OPERATOR_FINISHED;
|
|
}
|
|
|
|
/* non-standard poll operator which doesn't care if there are any nodes */
|
|
static int node_properties_poll(bContext *C)
|
|
{
|
|
ScrArea *sa= CTX_wm_area(C);
|
|
return (sa && (sa->spacetype == SPACE_NODE));
|
|
}
|
|
|
|
void NODE_OT_properties(wmOperatorType *ot)
|
|
{
|
|
ot->name= "Properties";
|
|
ot->description= "Toggles the properties panel display";
|
|
ot->idname= "NODE_OT_properties";
|
|
|
|
ot->exec= node_properties;
|
|
ot->poll= node_properties_poll;
|
|
|
|
/* flags */
|
|
ot->flag= 0;
|
|
}
|