[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18056] branches/blender2.5/blender/source /blender/editors: 2.5 / Nodes
Nathan Letwory
jesterking at letwory.net
Thu Dec 25 19:29:58 CET 2008
Revision: 18056
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18056
Author: jesterking
Date: 2008-12-25 19:29:56 +0100 (Thu, 25 Dec 2008)
Log Message:
-----------
2.5 / Nodes
* header menu drawing
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/SConscript
branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
Modified: branches/blender2.5/blender/source/blender/editors/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/SConscript 2008-12-25 16:02:35 UTC (rev 18055)
+++ branches/blender2.5/blender/source/blender/editors/SConscript 2008-12-25 18:29:56 UTC (rev 18056)
@@ -24,5 +24,5 @@
'space_script/SConscript',
'space_text/SConscript',
'space_sequencer/SConscript',
- 'transform/SConscript', # XXX this should be moved near start of list, as many modules depend on this?
+ 'transform/SConscript',
'screen/SConscript'])
Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_header.c 2008-12-25 16:02:35 UTC (rev 18055)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_header.c 2008-12-25 18:29:56 UTC (rev 18056)
@@ -41,6 +41,8 @@
#include "BKE_context.h"
#include "BKE_screen.h"
+#include "BKE_node.h"
+#include "BKE_main.h"
#include "ED_screen.h"
#include "ED_types.h"
@@ -61,22 +63,385 @@
/* ************************ header area region *********************** */
-static void do_viewmenu(bContext *C, void *arg, int event)
+static void do_node_selectmenu(bContext *C, void *arg, int event)
{
+ ScrArea *curarea= CTX_wm_area(C);
+ SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
+
+ /* functions in editnode.c assume there's a tree */
+ if(snode->nodetree==NULL)
+ return;
+
+ switch(event) {
+ case 1: /* border select */
+ // XXX node_border_select(snode);
+ break;
+ case 2: /* select/deselect all */
+ // XXX node_deselectall(snode, 1);
+ break;
+ case 3: /* select linked in */
+ // XXX node_select_linked(snode, 0);
+ break;
+ case 4: /* select linked out */
+ // XXX node_select_linked(snode, 1);
+ break;
+ }
+
+ ED_area_tag_redraw(curarea);
+}
+static uiBlock *node_selectmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+ ScrArea *curarea= CTX_wm_area(C);
+ uiBlock *block;
+ short yco= 0, menuwidth=120;
+
+ block= uiBeginBlock(C, handle->region, "node_selectmenu",
+ UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_selectmenu, NULL);
+
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Border Select|B", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
+
+ uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select/Deselect All|A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Linked From|L", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Linked To|Shift L", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
+
+ if(curarea->headertype==HEADERTOP) {
+ uiBlockSetDirection(block, UI_DOWN);
+ }
+ else {
+ uiBlockSetDirection(block, UI_TOP);
+ uiBlockFlipOrder(block);
+ }
+
+ uiTextBoundsBlock(block, 50);
+ uiEndBlock(C, block);
+
+ return block;
}
-static uiBlock *dummy_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+void do_node_addmenu(bContext *C, void *arg, int event)
{
+ #if 0
+ // XXX enable
ScrArea *curarea= CTX_wm_area(C);
+ SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
+ bNode *node;
+ float locx, locy;
+ short mval[2];
+
+ /* store selection in temp test flag */
+ for(node= snode->edittree->nodes.first; node; node= node->next) {
+ if(node->flag & NODE_SELECT) node->flag |= NODE_TEST;
+ else node->flag &= ~NODE_TEST;
+ }
+
+ toolbox_mousepos(mval, 0 ); /* get initial mouse position */
+ areamouseco_to_ipoco(G.v2d, mval, &locx, &locy);
+ node= node_add_node(snode, event, locx, locy);
+
+ /* uses test flag */
+ // XXX snode_autoconnect(snode, node, NODE_TEST);
+
+ // XXX addqueue(curarea->win, UI_BUT_EVENT, B_NODE_TREE_EXEC);
+
+ BIF_undo_push("Add Node");
+ #endif
+}
+
+static void node_make_addmenu(bContext *C, int nodeclass, uiBlock *block)
+{
+ Main *bmain= CTX_data_main(C);
+ SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
+ bNodeTree *ntree;
+ int tot= 0, a;
+ short yco= 0, menuwidth=120;
+
+ ntree = snode->nodetree;
+ if(ntree) {
+ /* mostly taken from toolbox.c, node_add_sublevel() */
+ if(ntree) {
+ if(nodeclass==NODE_CLASS_GROUP) {
+ bNodeTree *ngroup= bmain->nodetree.first;
+ for(; ngroup; ngroup= ngroup->id.next)
+ if(ngroup->type==ntree->type)
+ tot++;
+ }
+ else {
+ bNodeType *type = ntree->alltypes.first;
+ while(type) {
+ if(type->nclass == nodeclass)
+ tot++;
+ type= type->next;
+ }
+ }
+ }
+
+ if(tot==0) {
+ uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+ return;
+ }
+
+ if(nodeclass==NODE_CLASS_GROUP) {
+ bNodeTree *ngroup= bmain->nodetree.first;
+ for(tot=0, a=0; ngroup; ngroup= ngroup->id.next, tot++) {
+ if(ngroup->type==ntree->type) {
+
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, (ngroup->id.name+2), 0,
+ yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, NODE_GROUP_MENU+tot, "");
+ a++;
+ }
+ }
+ }
+ else {
+ bNodeType *type;
+ int script=0;
+ for(a=0, type= ntree->alltypes.first; type; type=type->next) {
+ if( type->nclass == nodeclass ) {
+ if(type->type == NODE_DYNAMIC) {
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, type->name, 0,
+ yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, NODE_DYNAMIC_MENU+script, "");
+ script++;
+ } else {
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, type->name, 0,
+ yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, type->type, "");
+ }
+ a++;
+ }
+ }
+ }
+ } else {
+ uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+ return;
+ }
+}
+
+static uiBlock *node_add_inputmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
uiBlock *block;
+
+ block= uiBeginBlock(C, handle->region, "node_add_inputmenu", UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_addmenu, NULL);
+
+ node_make_addmenu(C, NODE_CLASS_INPUT, block);
+
+ uiBlockSetDirection(block, UI_RIGHT);
+ uiTextBoundsBlock(block, 60);
+ uiEndBlock(C, block);
+
+ return block;
+}
+static uiBlock *node_add_outputmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+ uiBlock *block;
+
+ block= uiBeginBlock(C, handle->region, "node_add_outputmenu", UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_addmenu, NULL);
+
+ node_make_addmenu(C, NODE_CLASS_OUTPUT, block);
+
+ uiBlockSetDirection(block, UI_RIGHT);
+ uiTextBoundsBlock(block, 60);
+ uiEndBlock(C, block);
+
+ return block;
+}
+static uiBlock *node_add_colormenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+ uiBlock *block;
+
+ block= uiBeginBlock(C, handle->region, "node_add_colormenu", UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_addmenu, NULL);
+
+ node_make_addmenu(C, NODE_CLASS_OP_COLOR, block);
+
+ uiBlockSetDirection(block, UI_RIGHT);
+ uiTextBoundsBlock(block, 60);
+ uiEndBlock(C, block);
+
+ return block;
+}
+static uiBlock *node_add_vectormenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+ uiBlock *block;
+
+ block= uiBeginBlock(C, handle->region, "node_add_vectormenu", UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_addmenu, NULL);
+
+ node_make_addmenu(C, NODE_CLASS_OP_VECTOR, block);
+
+ uiBlockSetDirection(block, UI_RIGHT);
+ uiTextBoundsBlock(block, 60);
+ uiEndBlock(C, block);
+
+ return block;
+}
+static uiBlock *node_add_filtermenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+ uiBlock *block;
+
+ block= uiBeginBlock(C, handle->region, "node_add_filtermenu", UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_addmenu, NULL);
+
+ node_make_addmenu(C, NODE_CLASS_OP_FILTER, block);
+
+ uiBlockSetDirection(block, UI_RIGHT);
+ uiTextBoundsBlock(block, 60);
+ uiEndBlock(C, block);
+
+ return block;
+}
+static uiBlock *node_add_convertermenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+ uiBlock *block;
+
+ block= uiBeginBlock(C, handle->region, "node_add_convertermenu", UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_addmenu, NULL);
+
+ node_make_addmenu(C, NODE_CLASS_CONVERTOR, block);
+
+ uiBlockSetDirection(block, UI_RIGHT);
+ uiTextBoundsBlock(block, 60);
+ uiEndBlock(C, block);
+
+ return block;
+}
+static uiBlock *node_add_mattemenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+ uiBlock *block;
+
+ block= uiBeginBlock(C, handle->region, "node_add_mattemenu", UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_addmenu, NULL);
+
+ node_make_addmenu(C, NODE_CLASS_MATTE, block);
+
+ uiBlockSetDirection(block, UI_RIGHT);
+ uiTextBoundsBlock(block, 60);
+ uiEndBlock(C, block);
+
+ return block;
+}
+static uiBlock *node_add_distortmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+ uiBlock *block;
+
+ block= uiBeginBlock(C, handle->region, "node_add_distortmenu", UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_addmenu, NULL);
+
+ node_make_addmenu(C, NODE_CLASS_DISTORT, block);
+
+ uiBlockSetDirection(block, UI_RIGHT);
+ uiTextBoundsBlock(block, 60);
+ uiEndBlock(C, block);
+
+ return block;
+}
+static uiBlock *node_add_patternmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+ uiBlock *block;
+
+ block= uiBeginBlock(C, handle->region, "node_add_patternmenu", UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_addmenu, NULL);
+
+ node_make_addmenu(C, NODE_CLASS_PATTERN, block);
+
+ uiBlockSetDirection(block, UI_RIGHT);
+ uiTextBoundsBlock(block, 60);
+ uiEndBlock(C, block);
+
+ return block;
+}
+static uiBlock *node_add_texturemenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+ uiBlock *block;
+
+ block= uiBeginBlock(C, handle->region, "node_add_texturemenu", UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_addmenu, NULL);
+
+ node_make_addmenu(C, NODE_CLASS_TEXTURE, block);
+
+ uiBlockSetDirection(block, UI_RIGHT);
+ uiTextBoundsBlock(block, 60);
+ uiEndBlock(C, block);
+
+ return block;
+}
+static uiBlock *node_add_groupmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+ uiBlock *block;
+
+ block= uiBeginBlock(C, handle->region, "node_add_groupmenu", UI_EMBOSSP, UI_HELV);
+ uiBlockSetButmFunc(block, do_node_addmenu, NULL);
+
+ node_make_addmenu(C, NODE_CLASS_GROUP, block);
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list