Orange: daily commit of continuing work on noodle editor.
- delete/duplicate with connection links - type awareness for sockets - make connections checks for max amount of possible connections - added dependency sorting of node list - cyclic connections are drawn red now, press Ckey to see the other bad cycles. - added UI toolkit support in nodes (try shift+a) So, almost ready for execution code. :)
This commit is contained in:
@@ -50,6 +50,7 @@ bNode *nodeAddNode(struct bNodeTree *ntree, char *name)
|
||||
return node;
|
||||
}
|
||||
|
||||
/* keep listorder identical, for copying links */
|
||||
bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node)
|
||||
{
|
||||
bNode *nnode= MEM_callocN(sizeof(bNode), "dupli node");
|
||||
@@ -61,9 +62,10 @@ bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node)
|
||||
duplicatelist(&nnode->outputs, &node->outputs);
|
||||
if(nnode->id)
|
||||
nnode->id->us++;
|
||||
|
||||
node->flag= NODE_SELECT;
|
||||
|
||||
return nnode;
|
||||
|
||||
}
|
||||
|
||||
bNodeLink *nodeAddLink(bNodeTree *ntree, bNode *fromnode, bNodeSocket *fromsock, bNode *tonode, bNodeSocket *tosock)
|
||||
@@ -79,20 +81,59 @@ bNodeLink *nodeAddLink(bNodeTree *ntree, bNode *fromnode, bNodeSocket *fromsock,
|
||||
return link;
|
||||
}
|
||||
|
||||
bNodeSocket *nodeAddSocket(bNode *node, int type, int where, int limit, char *name)
|
||||
{
|
||||
bNodeSocket *sock= MEM_callocN(sizeof(bNodeSocket), "sock");
|
||||
|
||||
BLI_strncpy(sock->name, name, NODE_MAXSTR);
|
||||
sock->limit= limit;
|
||||
sock->type= type;
|
||||
if(where==SOCK_IN)
|
||||
BLI_addtail(&node->inputs, sock);
|
||||
else
|
||||
BLI_addtail(&node->outputs, sock);
|
||||
|
||||
return sock;
|
||||
}
|
||||
|
||||
/* ************** Free stuff ********** */
|
||||
|
||||
/* goes over entire tree */
|
||||
static void node_unlink_node(bNodeTree *ntree, bNode *node)
|
||||
{
|
||||
bNodeLink *link, *next;
|
||||
bNodeSocket *sock;
|
||||
ListBase *lb;
|
||||
|
||||
for(link= ntree->links.first; link; link= next) {
|
||||
next= link->next;
|
||||
|
||||
if(link->fromnode==node)
|
||||
lb= &node->outputs;
|
||||
else if(link->tonode==node)
|
||||
lb= &node->inputs;
|
||||
else
|
||||
lb= NULL;
|
||||
|
||||
if(lb) {
|
||||
for(sock= lb->first; sock; sock= sock->next) {
|
||||
if(link->fromsock==sock || link->tosock==sock)
|
||||
break;
|
||||
}
|
||||
if(sock) {
|
||||
BLI_remlink(&ntree->links, link);
|
||||
MEM_freeN(link);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void nodeFreeNode(bNodeTree *ntree, bNode *node)
|
||||
{
|
||||
if(ntree)
|
||||
if(ntree) {
|
||||
node_unlink_node(ntree, node);
|
||||
|
||||
BLI_remlink(&ntree->nodes, node);
|
||||
}
|
||||
if(node->id)
|
||||
node->id->us--;
|
||||
|
||||
@@ -132,3 +173,102 @@ bNodeLink *nodeFindLink(bNodeTree *ntree, bNodeSocket *from, bNodeSocket *to)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int nodeCountSocketLinks(bNodeTree *ntree, bNodeSocket *sock)
|
||||
{
|
||||
bNodeLink *link;
|
||||
int tot= 0;
|
||||
|
||||
for(link= ntree->links.first; link; link= link->next) {
|
||||
if(link->fromsock==sock || link->tosock==sock)
|
||||
tot++;
|
||||
}
|
||||
return tot;
|
||||
}
|
||||
|
||||
/* ************** solve stuff *********** */
|
||||
|
||||
/* node is guaranteed to be not checked before */
|
||||
static int node_recurs_check(bNode *node, bNode ***nsort, int level)
|
||||
{
|
||||
bNodeSocket *sock;
|
||||
bNodeLink *link;
|
||||
int has_inputlinks= 0;
|
||||
|
||||
node->done= 1;
|
||||
level++;
|
||||
|
||||
for(sock= node->inputs.first; sock; sock= sock->next) {
|
||||
for(link= sock->links.first; link; link= link->next) {
|
||||
has_inputlinks= 1;
|
||||
if(link->fromnode->done==0) {
|
||||
link->fromnode->level= node_recurs_check(link->fromnode, nsort, level);
|
||||
}
|
||||
}
|
||||
}
|
||||
// printf("node sort %s level %d\n", node->name, level);
|
||||
**nsort= node;
|
||||
(*nsort)++;
|
||||
|
||||
if(has_inputlinks)
|
||||
return level;
|
||||
else
|
||||
return 0xFFF;
|
||||
}
|
||||
|
||||
void nodeSolveOrder(bNodeTree *ntree)
|
||||
{
|
||||
bNode *node, **nodesort, **nsort;
|
||||
bNodeSocket *sock;
|
||||
bNodeLink *link;
|
||||
int a, totnode=0;
|
||||
|
||||
/* move all links into the input sockets, to find dependencies */
|
||||
/* first clear data */
|
||||
for(node= ntree->nodes.first; node; node= node->next) {
|
||||
node->done= 0;
|
||||
totnode++;
|
||||
for(sock= node->inputs.first; sock; sock= sock->next)
|
||||
sock->links.first= sock->links.last= NULL;
|
||||
}
|
||||
if(totnode==0)
|
||||
return;
|
||||
|
||||
while((link= ntree->links.first)) {
|
||||
BLI_remlink(&ntree->links, link);
|
||||
BLI_addtail(&link->tosock->links, link);
|
||||
}
|
||||
|
||||
nsort= nodesort= MEM_callocN(totnode*sizeof(void *), "sorted node array");
|
||||
|
||||
/* recursive check */
|
||||
for(node= ntree->nodes.first; node; node= node->next) {
|
||||
if(node->done==0) {
|
||||
node->level= node_recurs_check(node, &nsort, 0);
|
||||
}
|
||||
}
|
||||
|
||||
/* re-insert nodes in order, first a paranoia check */
|
||||
for(a=0; a<totnode; a++) {
|
||||
if(nodesort[a]==NULL)
|
||||
break;
|
||||
}
|
||||
if(a<totnode)
|
||||
printf("sort error in node tree");
|
||||
else {
|
||||
ntree->nodes.first= ntree->nodes.last= NULL;
|
||||
for(a=0; a<totnode; a++)
|
||||
BLI_addtail(&ntree->nodes, nodesort[a]);
|
||||
}
|
||||
|
||||
MEM_freeN(nodesort);
|
||||
|
||||
/* move links back */
|
||||
for(node= ntree->nodes.first; node; node= node->next) {
|
||||
for(sock= node->inputs.first; sock; sock= sock->next) {
|
||||
while((link= sock->links.first)) {
|
||||
BLI_remlink(&sock->links, link);
|
||||
BLI_addtail(&ntree->links, link);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user