Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

More Node Editor Fixups:

Browse Source 
* Restored Mute and Hide Operators, M and H keys respectively
* Restored Make Links Operator (F). However, I can't figure out how to set the sockets so that this can be used
* Made Alt-RMB the new hotkey for breaking links by dragging, since Alt-LMB was taken for panning already
This commit is contained in:
Joshua Leung
2009-11-20 06:31:49 +00:00
parent cb40583b90
commit e7413bf791
5 changed files with 218 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
release/scripts/ui/space_node.py
View File

@@ -106,17 +106,17 @@ class NODE_MT_node(bpy.types.Menu):
layout = self.layout
layout.itemO("tfm.translate")
layout.itemO("tfm.resize")
layout.itemO("tfm.rotate")
layout.itemO("tfm.resize")
layout.itemS()
layout.itemO("node.duplicate")
layout.itemO("node.delete")
# XXX
# layout.itemS()
# layout.itemO("node.make_link")
layout.itemS()
layout.itemO("node.link_make")
layout.itemS()
layout.itemO("node.group_edit")
layout.itemO("node.group_ungroup")
@@ -124,7 +124,8 @@ class NODE_MT_node(bpy.types.Menu):
layout.itemS()
layout.itemO("node.visibility_toggle")
layout.itemO("node.hide")
layout.itemO("node.mute")
# XXX
# layout.itemO("node.rename")

484
source/blender/editors/space_node/node_edit.c
View File

@@ -1369,6 +1369,7 @@ static void node_hide_unhide_sockets(SpaceNode *snode, bNode *node)
}
// XXX duplicate function
/*static*/ int do_header_node(SpaceNode *snode, bNode *node, float mx, float my)
{
rctf totr= node->totr;
@@ -1423,6 +1424,7 @@ static void node_hide_unhide_sockets(SpaceNode *snode, bNode *node)
return 0;
}
// XXX duplicate function
/*static*/ int do_header_hidden_node(SpaceNode *snode, bNode *node, float mx, float my)
{
rctf totr= node->totr;
@@ -1578,7 +1580,7 @@ static int node_socket_hilights(SpaceNode *snode, int in_out)
if(snode->edittree==NULL) return 0;
/* deselect socks */
/* deselect sockets */
for(node= snode->edittree->nodes.first; node; node= node->next) {
for(sock= node->inputs.first; sock; sock= sock->next) {
if(sock->flag & SELECT) {
@@ -1721,33 +1723,9 @@ bNode *node_add_node(SpaceNode *snode, Scene *scene, int type, float locx, float
return node;
}
#if 0
/* ****************** Duplicate *********************** */
void node_mute(SpaceNode *snode)
{
bNode *node;
/* no disabling inside of groups */
if(node_tree_get_editgroup(snode->nodetree))
return;
for(node= snode->edittree->nodes.first; node; node= node->next) {
if(node->flag & SELECT) {
if(node->inputs.first && node->outputs.first) {
if(node->flag & NODE_MUTED)
node->flag &= ~NODE_MUTED;
else
node->flag |= NODE_MUTED;
}
}
}
}
#endif
int node_duplicate_exec(bContext *C, wmOperator *op)
static int node_duplicate_exec(bContext *C, wmOperator *op)
{
SpaceNode *snode= CTX_wm_space_node(C);
@@ -1764,6 +1742,7 @@ static int node_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
node_duplicate_exec(C, op);
// todo... remove this - this is for a modal op instead!
RNA_int_set(op->ptr, "mode", TFM_TRANSLATION);
WM_operator_name_call(C, "TFM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr);
@@ -1772,7 +1751,6 @@ static int node_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event)
void NODE_OT_duplicate(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Duplicate Nodes";
ot->description = "Duplicate the nodes.";
@@ -1791,44 +1769,6 @@ void NODE_OT_duplicate(wmOperatorType *ot)
RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
}
#if 0
static void node_insert_convertor(SpaceNode *snode, bNodeLink *link)
{
bNode *newnode= NULL;
if(link->fromsock->type==SOCK_RGBA && link->tosock->type==SOCK_VALUE) {
if(snode->edittree->type==NTREE_SHADER)
newnode= node_add_node(snode, SH_NODE_RGBTOBW, 0.0f, 0.0f);
else if(snode->edittree->type==NTREE_COMPOSIT)
newnode= node_add_node(snode, CMP_NODE_RGBTOBW, 0.0f, 0.0f);
else
newnode= NULL;
}
else if(link->fromsock->type==SOCK_VALUE && link->tosock->type==SOCK_RGBA) {
if(snode->edittree->type==NTREE_SHADER)
newnode= node_add_node(snode, SH_NODE_VALTORGB, 0.0f, 0.0f);
else if(snode->edittree->type==NTREE_COMPOSIT)
newnode= node_add_node(snode, CMP_NODE_VALTORGB, 0.0f, 0.0f);
else
newnode= NULL;
}
if(newnode) {
/* dangerous assumption to use first in/out socks, but thats fine for now */
newnode->flag |= NODE_HIDDEN;
newnode->locx= 0.5f*(link->fromsock->locx + link->tosock->locx);
newnode->locy= 0.5f*(link->fromsock->locy + link->tosock->locy) + HIDDEN_RAD;
nodeAddLink(snode->edittree, newnode, newnode->outputs.first, link->tonode, link->tosock);
link->tonode= newnode;
link->tosock= newnode->inputs.first;
}
}
#endif /* 0 */
/* *************************** add link op ******************** */
/* temp data to pass on to modal */
@@ -2073,57 +2013,57 @@ void NODE_OT_link(wmOperatorType *ot)
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
}
void node_hide(SpaceNode *snode)
{
bNode *node;
int nothidden=0, ishidden=0;
for(node= snode->edittree->nodes.first; node; node= node->next) {
if(node->flag & SELECT) {
if(node->flag & NODE_HIDDEN)
ishidden++;
else
nothidden++;
}
}
for(node= snode->edittree->nodes.first; node; node= node->next) {
if(node->flag & SELECT) {
if( (ishidden && nothidden) || ishidden==0)
node->flag |= NODE_HIDDEN;
else
node->flag &= ~NODE_HIDDEN;
}
}
}
#if 0
/* ********************** Make Link operator ***************** */
/* makes a link between selected output and input sockets */
void node_make_link(SpaceNode *snode)
static int node_make_link_exec(bContext *C, wmOperator *op)
{
SpaceNode *snode= CTX_wm_space_node(C);
bNode *fromnode, *tonode;
bNodeLink *link;
bNodeSocket *outsock= snode->edittree->selout;
bNodeSocket *insock= snode->edittree->selin;
if(!insock || !outsock) return;
if(nodeFindLink(snode->edittree, outsock, insock)) return;
if (!insock || !outsock) {
BKE_report(op->reports, RPT_ERROR, "No input or output socket(s) selected");
return OPERATOR_CANCELLED;
}
if (nodeFindLink(snode->edittree, outsock, insock)) {
BKE_report(op->reports, RPT_ERROR, "There is already a link between these sockets");
return OPERATOR_CANCELLED;
}
if(nodeFindNode(snode->edittree, outsock, &fromnode, NULL) &&
nodeFindNode(snode->edittree, insock, &tonode, NULL)) {
if (nodeFindNode(snode->edittree, outsock, &fromnode, NULL) &&
nodeFindNode(snode->edittree, insock, &tonode, NULL))
{
link= nodeAddLink(snode->edittree, fromnode, outsock, tonode, insock);
NodeTagChanged(snode->edittree, tonode);
node_remove_extra_links(snode, insock, link);
}
else return;
else
return OPERATOR_CANCELLED;
ntreeSolveOrder(snode->edittree);
node_tree_verify_groups(snode->nodetree);
// XXX snode_handle_recalc(snode);
snode_handle_recalc(C, snode);
return OPERATOR_FINISHED;
}
void NODE_OT_link_make(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Make Links";
ot->description= "Makes a link between selected output in input sockets.";
ot->idname= "NODE_OT_link_make";
/* callbacks */
ot->exec= node_make_link_exec;
ot->poll= ED_operator_node_active; // XXX we need a special poll which checks that there are selected input/output sockets
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
#endif
/* ********************** Cut Link operator ***************** */
@@ -2206,6 +2146,7 @@ void NODE_OT_links_cut(wmOperatorType *ot)
}
/* ******************************** */
// XXX some code needing updating to operators...
/* goes over all scenes, reads render layerss */
void node_read_renderlayers(SpaceNode *snode)
@@ -2330,216 +2271,93 @@ void NODE_OT_group_make(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
}
#if 0
/* ****************** Hide operator *********************** */
/* ******************** main event loop ****************** */
void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
static int node_hide_exec(bContext *C, wmOperator *op)
{
SpaceNode *snode= spacedata;
bNode *actnode;
bNodeSocket *actsock;
unsigned short event= evt->event;
short val= evt->val, doredraw=0, fromlib= 0;
SpaceNode *snode= CTX_wm_space_node(C);
bNode *node;
int nothidden=0, ishidden=0;
if(sa->win==0) return;
/* sanity checking (poll callback checks this already) */
if((snode == NULL) || (snode->edittree == NULL))
return OPERATOR_CANCELLED;
if(snode->nodetree==NULL) {
/* no other events should be handled, but floating panels still should get handled */
uiDoBlocks(&curarea->uiblocks, event, 1);
return;
for(node= snode->edittree->nodes.first; node; node= node->next) {
if(node->flag & SELECT) {
if(node->flag & NODE_HIDDEN)
ishidden++;
else
nothidden++;
}
}
if(val) {
if( node_uiDoBlocks(sa, event)!=UI_NOTHING ) event= 0;
fromlib= (snode->id && snode->id->lib);
switch(event) {
case LEFTMOUSE:
if(gpencil_do_paint(sa, L_MOUSE)) {
return;
}
else if(fromlib) {
if(node_mouse_groupheader(snode)==0)
//node_mouse_select(snode, event);
}
else {
if(G.qual & LR_CTRLKEY)
if(gesture())
break;
// if(node_add_link(snode)==0)
if(node_mouse_groupheader(snode)==0)
// if(node_mouse_select(snode, event)==0)
node_border_link_delete(snode);
}
break;
case RIGHTMOUSE:
if(gpencil_do_paint(sa, R_MOUSE)) {
return;
}
else if(find_indicated_socket(snode, &actnode, &actsock, SOCK_IN)) {
if(actsock->flag & SOCK_SEL) {
snode->edittree->selin= NULL;
actsock->flag&= ~SOCK_SEL;
}
else {
snode->edittree->selin= actsock;
reset_sel_socket(snode, SOCK_IN);
actsock->flag|= SOCK_SEL;
}
}
else if(find_indicated_socket(snode, &actnode, &actsock, SOCK_OUT)) {
if(actsock->flag & SOCK_SEL) {
snode->edittree->selout= NULL;
actsock->flag&= ~SOCK_SEL;
}
else {
snode->edittree->selout= actsock;
reset_sel_socket(snode, SOCK_OUT);
actsock->flag|= SOCK_SEL;
}
}
// else if(!node_mouse_select(snode, event))
// toolbox_n();
break;
case MIDDLEMOUSE:
if((snode->flag & SNODE_BACKDRAW) && (snode->treetype==NTREE_COMPOSIT)
&& (G.qual==LR_SHIFTKEY)) {
snode_bg_viewmove(snode);
} else {
view2dmove(event);
}
case WHEELUPMOUSE:
case WHEELDOWNMOUSE:
view2dmove(event); /* in drawipo.c */
break;
case MOUSEY:
doredraw= node_socket_hilights(snode, SOCK_IN|SOCK_OUT);
break;
case UI_BUT_EVENT:
/* future: handlerize this! */
if(snode->treetype==NTREE_SHADER)
shader_node_event(snode, val);
else if(snode->treetype==NTREE_COMPOSIT)
composit_node_event(snode, val);
else if(snode->treetype==NTREE_TEXTURE)
texture_node_event(snode, val);
break;
case PADPLUSKEY:
snode_zoom_in(sa);
doredraw= 1;
break;
case PADMINUS:
snode_zoom_out(sa);
doredraw= 1;
break;
case HOMEKEY:
snode_home(sa, snode);
doredraw= 1;
break;
case TABKEY:
if(fromlib) fromlib= -1;
else snode_make_group_editable(snode, NULL);
break;
case AKEY:
if(G.qual==LR_SHIFTKEY) {
if(fromlib) fromlib= -1;
else toolbox_n_add();
}
break;
case BKEY:
if(G.qual==0)
node_border_select(snode);
break;
case CKEY: /* sort again, showing cyclics */
ntreeSolveOrder(snode->edittree);
doredraw= 1;
break;
case DKEY:
if(G.qual==LR_SHIFTKEY) {
if(fromlib) fromlib= -1;
else node_adduplicate(snode);
}
break;
case EKEY:
// XXX snode_handle_recalc(snode);
break;
case FKEY:
node_make_link(snode);
break;
case GKEY:
if(fromlib) fromlib= -1;
else {
if(G.qual==LR_CTRLKEY) {
if(okee("Make Group"))
node_make_group(snode);
}
else if(G.qual==LR_ALTKEY) {
if(okee("Ungroup"))
node_ungroup(snode);
}
else if(G.qual==LR_SHIFTKEY) {
node_addgroup(snode);
}
// else
// XXX transform_nodes(snode->edittree, 'g', "Move Node");
}
break;
case HKEY:
node_hide(snode);
break;
case IKEY:
node_insert_key(snode);
break;
case LKEY:
node_select_linked(snode, G.qual==LR_SHIFTKEY);
break;
case MKEY:
node_mute(snode);
break;
case RKEY:
if(G.qual==LR_CTRLKEY) {
node_rename(snode);
}
else if(G.qual==LR_SHIFTKEY) {
if(okee("Read saved Full Sample Layers"))
node_read_fullsamplelayers(snode);
}
else {
if(okee("Read saved Render Layers"))
node_read_renderlayers(snode);
}
break;
case DELKEY:
case XKEY:
if(G.qual==LR_ALTKEY) {
gpencil_delete_menu();
}
else {
if(fromlib) fromlib= -1;
else node_delete(snode);
}
break;
for(node= snode->edittree->nodes.first; node; node= node->next) {
if(node->flag & SELECT) {
if( (ishidden && nothidden) || ishidden==0)
node->flag |= NODE_HIDDEN;
else
node->flag &= ~NODE_HIDDEN;
}
}
if(fromlib==-1)
error_libdata();
if(doredraw)
scrarea_queue_winredraw(sa);
if(doredraw==2)
scrarea_queue_headredraw(sa);
snode_handle_recalc(C, snode);
return OPERATOR_FINISHED;
}
void NODE_OT_hide(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Hide Nodes";
ot->description= "Toggle hiding of the nodes.";
ot->idname= "NODE_OT_hide";
/* callbacks */
ot->exec= node_hide_exec;
ot->poll= ED_operator_node_active;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
/* ****************** Mute operator *********************** */
static int node_mute_exec(bContext *C, wmOperator *op)
{
SpaceNode *snode= CTX_wm_space_node(C);
bNode *node;
/* no disabling inside of groups */
if(node_tree_get_editgroup(snode->nodetree))
return OPERATOR_CANCELLED;
for(node= snode->edittree->nodes.first; node; node= node->next) {
if(node->flag & SELECT) {
if(node->inputs.first && node->outputs.first) {
node->flag ^= NODE_MUTED;
}
}
}
snode_handle_recalc(C, snode);
return OPERATOR_FINISHED;
}
void NODE_OT_mute(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Mute Nodes";
ot->description= "Toggle muting of the nodes.";
ot->idname= "NODE_OT_mute";
/* callbacks */
ot->exec= node_mute_exec;
ot->poll= ED_operator_node_active;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
#endif
/* ****************** Delete operator ******************* */
@@ -2568,10 +2386,7 @@ static int node_delete_exec(bContext *C, wmOperator *op)
node_tree_verify_groups(snode->nodetree);
// NODE_FIX_ME
// snode_handle_recalc(snode);
WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL); /* Do we need to pass the scene? */
snode_handle_recalc(C, snode);
return OPERATOR_FINISHED;
}
@@ -2591,3 +2406,64 @@ void NODE_OT_delete(wmOperatorType *ot)
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
#if 0
/* ******************** main event loop ****************** */
void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
{
SpaceNode *snode= spacedata;
bNode *actnode;
bNodeSocket *actsock;
unsigned short event= evt->event;
short val= evt->val, doredraw=0, fromlib= 0;
if(sa->win==0) return;
if(snode->nodetree==NULL) {
/* no other events should be handled, but floating panels still should get handled */
uiDoBlocks(&curarea->uiblocks, event, 1);
return;
}
if(val) {
if( node_uiDoBlocks(sa, event)!=UI_NOTHING ) event= 0;
fromlib= (snode->id && snode->id->lib);
switch(event) {
case CKEY: /* sort again, showing cyclics */
ntreeSolveOrder(snode->edittree);
doredraw= 1;
break;
case EKEY:
// XXX snode_handle_recalc(snode);
break;
case RKEY:
if(G.qual==LR_CTRLKEY) {
node_rename(snode);
}
else if(G.qual==LR_SHIFTKEY) {
if(okee("Read saved Full Sample Layers"))
node_read_fullsamplelayers(snode);
}
else {
if(okee("Read saved Render Layers"))
node_read_renderlayers(snode);
}
break;
}
}
if(fromlib==-1)
error_libdata();
if(doredraw)
scrarea_queue_winredraw(sa);
if(doredraw==2)
scrarea_queue_headredraw(sa);
}
#endif

8
source/blender/editors/space_node/node_intern.h
View File

@@ -84,14 +84,20 @@ bNode *node_tree_get_editgroup(bNodeTree *ntree);
void snode_autoconnect(SpaceNode *snode, bNode *node_to, int flag);
void NODE_OT_duplicate(struct wmOperatorType *ot);
void NODE_OT_link(struct wmOperatorType *ot);
void NODE_OT_delete(struct wmOperatorType *ot);
void NODE_OT_resize(struct wmOperatorType *ot);
void NODE_OT_link(struct wmOperatorType *ot);
void NODE_OT_link_make(struct wmOperatorType *ot);
void NODE_OT_links_cut(struct wmOperatorType *ot);
void NODE_OT_group_make(struct wmOperatorType *ot);
void NODE_OT_group_ungroup(struct wmOperatorType *ot);
void NODE_OT_group_edit(struct wmOperatorType *ot);
void NODE_OT_mute(struct wmOperatorType *ot);
void NODE_OT_hide(struct wmOperatorType *ot);
// XXXXXX
// XXX from BSE_node.h

30
source/blender/editors/space_node/node_ops.c
View File

@@ -55,14 +55,21 @@ void node_operatortypes(void)
WM_operatortype_append(NODE_OT_select_all);
WM_operatortype_append(NODE_OT_select_linked_to);
WM_operatortype_append(NODE_OT_select_linked_from);
WM_operatortype_append(NODE_OT_visibility_toggle);
WM_operatortype_append(NODE_OT_view_all);
WM_operatortype_append(NODE_OT_select_border);
WM_operatortype_append(NODE_OT_delete);
WM_operatortype_append(NODE_OT_link);
WM_operatortype_append(NODE_OT_resize);
WM_operatortype_append(NODE_OT_links_cut);
WM_operatortype_append(NODE_OT_view_all);
WM_operatortype_append(NODE_OT_visibility_toggle);
WM_operatortype_append(NODE_OT_mute);
WM_operatortype_append(NODE_OT_hide);
WM_operatortype_append(NODE_OT_duplicate);
WM_operatortype_append(NODE_OT_delete);
WM_operatortype_append(NODE_OT_resize);
WM_operatortype_append(NODE_OT_link);
WM_operatortype_append(NODE_OT_link_make);
WM_operatortype_append(NODE_OT_links_cut);
WM_operatortype_append(NODE_OT_group_make);
WM_operatortype_append(NODE_OT_group_ungroup);
WM_operatortype_append(NODE_OT_group_edit);
@@ -93,13 +100,18 @@ void node_keymap(struct wmKeyConfig *keyconf)
/* each of these falls through if not handled... */
WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_resize", LEFTMOUSE, KM_PRESS, 0, 0); // XXX not working..
WM_keymap_add_item(keymap, "NODE_OT_resize", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_visibility_toggle", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_links_cut", RIGHTMOUSE, KM_PRESS, KM_CTRL|KM_ALT, 0);
WM_keymap_add_item(keymap, "NODE_OT_links_cut", RIGHTMOUSE, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "NODE_OT_link_make", FKEY, KM_PRESS, 0, 0);
WM_keymap_add_menu(keymap, "NODE_MT_add", AKEY, KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "NODE_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "NODE_OT_hide", HKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_mute", MKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_select_border", BKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_delete", XKEY, KM_PRESS, 0, 0);
@@ -113,7 +125,5 @@ void node_keymap(struct wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "NODE_OT_group_ungroup", GKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, 0, 0);
WM_keymap_add_menu(keymap, "NODE_MT_add", AKEY, KM_PRESS, KM_SHIFT, 0);
transform_keymap_for_space(keyconf, keymap, SPACE_NODE);
}

3
source/blender/editors/space_node/node_state.c
View File

@@ -55,7 +55,7 @@
#include "node_intern.h"
// XXX duplicate function
static int do_header_node(SpaceNode *snode, bNode *node, float mx, float my)
{
rctf totr= node->totr;
@@ -99,6 +99,7 @@ static int do_header_node(SpaceNode *snode, bNode *node, float mx, float my)
return 0;
}
// XXX duplicate function
static int do_header_hidden_node(SpaceNode *snode, bNode *node, float mx, float my)
{
rctf totr= node->totr;