griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Added header pulldown menus for the Node Editor. Also tweaked colours and some

Browse Source 
of the menu organisation, consolidating the redundant 'Generators' with 'Input'.
This commit is contained in:
Matt Ebb
2006-06-16 04:32:39 +00:00
parent 8008783e27
commit cf9e420ad3
8 changed files with 509 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
source/blender/src/editnode.c
View File

@@ -470,7 +470,7 @@ static void node_set_active(SpaceNode *snode, bNode *node)
}
}
static void snode_make_group_editable(SpaceNode *snode, bNode *gnode)
void snode_make_group_editable(SpaceNode *snode, bNode *gnode)
{
bNode *node;
@@ -515,7 +515,7 @@ static void snode_make_group_editable(SpaceNode *snode, bNode *gnode)
allqueue(REDRAWNODE, 0);
}
static void node_ungroup(SpaceNode *snode)
void node_ungroup(SpaceNode *snode)
{
bNode *gnode;
@@ -682,7 +682,7 @@ static bNode *visible_node(SpaceNode *snode, rctf *rct)
return tnode;
}
static void snode_home(ScrArea *sa, SpaceNode *snode)
void snode_home(ScrArea *sa, SpaceNode *snode)
{
bNode *node;
int first= 1;
@@ -705,6 +705,32 @@ static void snode_home(ScrArea *sa, SpaceNode *snode)
}
void snode_zoom_out(ScrArea *sa)
{
float dx;
dx= (float)(0.15*(G.v2d->cur.xmax-G.v2d->cur.xmin));
G.v2d->cur.xmin-= dx;
G.v2d->cur.xmax+= dx;
dx= (float)(0.15*(G.v2d->cur.ymax-G.v2d->cur.ymin));
G.v2d->cur.ymin-= dx;
G.v2d->cur.ymax+= dx;
test_view2d(G.v2d, sa->winx, sa->winy);
}
void snode_zoom_in(ScrArea *sa)
{
float dx;
dx= (float)(0.1154*(G.v2d->cur.xmax-G.v2d->cur.xmin));
G.v2d->cur.xmin+= dx;
G.v2d->cur.xmax-= dx;
dx= (float)(0.1154*(G.v2d->cur.ymax-G.v2d->cur.ymin));
G.v2d->cur.ymin+= dx;
G.v2d->cur.ymax-= dx;
test_view2d(G.v2d, sa->winx, sa->winy);
}
/* checks mouse position, and returns found node/socket */
/* type is SOCK_IN and/or SOCK_OUT */
static int find_indicated_socket(SpaceNode *snode, bNode **nodep, bNodeSocket **sockp, int in_out)
@@ -854,7 +880,7 @@ void node_transform_ext(int mode, int unused)
{
SpaceNode *snode= curarea->spacedata.first;
transform_nodes(snode->edittree, 'g', "Translate node");
transform_nodes(snode->edittree, 'g', "Move Node");
}
@@ -1542,7 +1568,7 @@ static int node_add_link(SpaceNode *snode)
return 0;
}
static void node_delete(SpaceNode *snode)
void node_delete(SpaceNode *snode)
{
bNode *node, *next;
@@ -1558,7 +1584,7 @@ static void node_delete(SpaceNode *snode)
allqueue(REDRAWNODE, 1);
}
static void node_hide(SpaceNode *snode)
void node_hide(SpaceNode *snode)
{
bNode *node;
int nothidden=0, ishidden=0;
@@ -1660,7 +1686,7 @@ static void node_border_link_delete(SpaceNode *snode)
}
/* goes over all scenes, reads render results */
static void node_read_renderresults(SpaceNode *snode)
void node_read_renderresults(SpaceNode *snode)
{
Scene *scene;
bNode *node;
@@ -1684,6 +1710,7 @@ static void node_read_renderresults(SpaceNode *snode)
snode_handle_recalc(snode);
}
/* ********************** */
void node_make_group(SpaceNode *snode)
@@ -1825,23 +1852,11 @@ void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
break;
case PADPLUSKEY:
dx= (float)(0.1154*(G.v2d->cur.xmax-G.v2d->cur.xmin));
G.v2d->cur.xmin+= dx;
G.v2d->cur.xmax-= dx;
dx= (float)(0.1154*(G.v2d->cur.ymax-G.v2d->cur.ymin));
G.v2d->cur.ymin+= dx;
G.v2d->cur.ymax-= dx;
test_view2d(G.v2d, sa->winx, sa->winy);
snode_zoom_in(sa);
doredraw= 1;
break;
case PADMINUS:
dx= (float)(0.15*(G.v2d->cur.xmax-G.v2d->cur.xmin));
G.v2d->cur.xmin-= dx;
G.v2d->cur.xmax+= dx;
dx= (float)(0.15*(G.v2d->cur.ymax-G.v2d->cur.ymin));
G.v2d->cur.ymin-= dx;
G.v2d->cur.ymax+= dx;
test_view2d(G.v2d, sa->winx, sa->winy);
snode_zoom_out(sa);
doredraw= 1;
break;
case HOMEKEY:
@@ -1892,7 +1907,7 @@ void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
node_addgroup(snode);
}
else
transform_nodes(snode->edittree, 'g', "Translate Node");
transform_nodes(snode->edittree, 'g', "Move Node");
}
break;
case HKEY: