2.5 / Nodes

* WIP selection operator.
  - selection is made, but redraw is still missing.

source/blender/editors/space_node/SConscript

@@ -3,7 +3,7 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
 incs += ' ../../nodes #intern/bmfont ../../render/extern/include'
 incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include'
 defs = []

source/blender/editors/space_node/node_edit.c

@@ -99,6 +99,12 @@
 #include "mydevice.h"
 #include "winlay.h"
 */
+
+#include "WM_types.h"
+
+// XXX XXX XXX
+static void BIF_undo_push(char *s) {}
+
 #if 0
 /* currently called from BIF_preview_changed */
 void snode_tag_dirty(SpaceNode *snode)
@@ -634,13 +640,15 @@ static void node_active_image(Image *ima)
 		scrarea_queue_headredraw(sa);
 	}
 }
+#endif /* 0 */
 
-
+void node_set_active(SpaceNode *snode, bNode *node)
-static void node_set_active(SpaceNode *snode, bNode *node)
 {
 	
 	nodeSetActive(snode->edittree, node);
 	
+	#if 0
+	// XXX
 	if(node->type!=NODE_GROUP) {
 		
 		/* tree specific activate calls */
@@ -700,6 +708,7 @@ static void node_set_active(SpaceNode *snode, bNode *node)
 			// allqueue(REDRAWIPO, 0);
 		}
 	}
+	#endif /* 0 */
 }
 
 void snode_make_group_editable(SpaceNode *snode, bNode *gnode)
@@ -718,9 +727,9 @@ void snode_make_group_editable(SpaceNode *snode, bNode *gnode)
 	
 	if(gnode && gnode->type==NODE_GROUP && gnode->id) {
 		if(gnode->id->lib) {
-			if(okee("Make Group Local"))
+			// XXX if(okee("Make Group Local"))
-				ntreeMakeLocal((bNodeTree *)gnode->id);
+			//	ntreeMakeLocal((bNodeTree *)gnode->id);
-			else
+			// else
 				return;
 		}
 		gnode->flag |= NODE_GROUP_EDIT;
@@ -747,6 +756,8 @@ void snode_make_group_editable(SpaceNode *snode, bNode *gnode)
 	// allqueue(REDRAWNODE, 0);
 }
 
+#if 0
+
 void node_ungroup(SpaceNode *snode)
 {
 	bNode *gnode;
@@ -1209,30 +1220,38 @@ void node_transform_ext(int mode, int unused)
 	
 	transform_nodes(snode->edittree, 'g', "Move Node");
 }
-
+#endif /* 0 */
 
 /* releases on event, only 1 node */
-static void scale_node(SpaceNode *snode, bNode *node)
+void scale_node(SpaceNode *snode, bNode *node)
 {
 	float mxstart, mystart, mx, my, oldwidth;
 	int cont=1, cancel=0;
 	short mval[2], mvalo[2];
 	
+	// XXX
+	mval[0] = mvalo[0] = 0;
+	mval[1] = mvalo[1] = 1;
+	mxstart = 0.0f;
+	mystart = 0.0f;
+	mx= 0.0f;
+	my= 0.0f;
+	
 	/* store old */
 	if(node->flag & NODE_HIDDEN)
 		oldwidth= node->miniwidth;
 	else
 		oldwidth= node->width;
 		
-	getmouseco_areawin(mvalo);
+/* XXX	getmouseco_areawin(mvalo);
-	areamouseco_to_ipoco(G.v2d, mvalo, &mxstart, &mystart);
+	areamouseco_to_ipoco(G.v2d, mvalo, &mxstart, &mystart);*/
 	
 	while(cont) {
 		
-		getmouseco_areawin(mval);
+		// XXX getmouseco_areawin(mval);
 		if(mval[0]!=mvalo[0] || mval[1]!=mvalo[1]) {
 			
-			areamouseco_to_ipoco(G.v2d, mval, &mx, &my);
+			// XXX areamouseco_to_ipoco(G.v2d, mval, &mx, &my);
 			mvalo[0]= mval[0];
 			mvalo[1]= mval[1];
 			
@@ -1245,12 +1264,12 @@ static void scale_node(SpaceNode *snode, bNode *node)
 				CLAMP(node->width, node->typeinfo->minwidth, node->typeinfo->maxwidth);
 			}
 			
-			force_draw(0);
+			// XXX force_draw(0);
 		}
 		else
-			PIL_sleep_ms(10);
+			; // XXX PIL_sleep_ms(10);
 		
-		while (qtest()) {
+		/* XXX while (qtest()) {
 			short val;
 			unsigned short event= extern_qread(&val);
 			
@@ -1268,7 +1287,7 @@ static void scale_node(SpaceNode *snode, bNode *node)
 					}
 					break;
 			}
-		}
+		}*/
 		
 	}
 	
@@ -1284,6 +1303,8 @@ static void scale_node(SpaceNode *snode, bNode *node)
 		ntreeTexUpdatePreviews(snode->nodetree);
 }
 
+#if 0
+
 /* ******************** rename ******************* */
 
 void node_rename(SpaceNode *snode)

source/blender/editors/space_node/node_intern.h

@@ -33,6 +33,11 @@
 struct ARegion;
 struct View2D;
 struct bContext;
+struct wmWindowManager;
+
+/* defines */
+
+#define NODE_SELECT_MOUSE		1
 
 
 /* node_header.c */
@@ -41,6 +46,13 @@ void node_header_buttons(const bContext *C, ARegion *ar);
 /* node_draw.c */
 void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d);
 
+/* node_ops.c */
+void node_operatortypes(void);
+void node_keymap(wmWindowManager *wm);
+
+/* node_select.c */
+void NODE_OT_select(struct wmOperatorType *ot);
+
 /* drawnode.c */
 void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link);
 void node_draw_link_bezier(View2D *v2d, float vec[][3], int th_col1, int th_col2, int do_shaded);
@@ -48,6 +60,9 @@ void draw_nodespace_back_pix(ScrArea *sa, SpaceNode *snode);
 
 /* node_edit.c */
 void snode_set_context(SpaceNode *snode, Scene *scene);
+void scale_node(SpaceNode *snode, bNode *node);
+void snode_make_group_editable(SpaceNode *snode, bNode *gnode);
+void node_set_active(SpaceNode *snode, bNode *node);
 
 #endif /* ED_NODE_INTERN_H */
 

source/blender/editors/space_node/node_ops.c

@@ -0,0 +1,57 @@
+/**
+ * $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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation, Nathan Letwory
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "DNA_node_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_space_types.h"
+
+#include "BKE_context.h"
+#include "BKE_node.h"
+
+#include "ED_space_api.h"
+#include "ED_screen.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "node_intern.h"
+
+void node_operatortypes(void)
+{
+	WM_operatortype_append(NODE_OT_select);
+}
+
+void node_keymap(struct wmWindowManager *wm)
+{
+	ListBase *keymap= WM_keymap_listbase(wm, "Node", SPACE_NODE, 0);
+	
+	RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select", SELECTMOUSE, KM_PRESS, 0, 0)->ptr, "select_type", NODE_SELECT_MOUSE);
+}

source/blender/editors/space_node/node_select.c

@@ -0,0 +1,301 @@
+/**
+ * $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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation, Nathan Letwory
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdio.h>
+
+#include "DNA_node_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+
+#include "BKE_context.h"
+#include "BKE_node.h"
+#include "BKE_global.h"
+
+#include "BLI_rect.h"
+
+#include "ED_space_api.h"
+#include "ED_screen.h"
+#include "ED_types.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "UI_view2d.h"
+ 
+#include "node_intern.h"
+ 
+/* ************************** Node generic ************** */
+
+/* allows to walk the list in order of visibility */
+static bNode *next_node(bNodeTree *ntree)
+{
+	static bNode *current=NULL, *last= NULL;
+	
+	if(ntree) {
+		/* set current to the first selected node */
+		for(current= ntree->nodes.last; current; current= current->prev)
+			if(current->flag & NODE_SELECT)
+				break;
+		
+		/* set last to the first unselected node */
+		for(last= ntree->nodes.last; last; last= last->prev)
+			if((last->flag & NODE_SELECT)==0)
+				break;
+		
+		if(current==NULL)
+			current= last;
+		
+		return NULL;
+	}
+	/* no nodes, or we are ready */
+	if(current==NULL)
+		return NULL;
+	
+	/* now we walk the list backwards, but we always return current */
+	if(current->flag & NODE_SELECT) {
+		bNode *node= current;
+		
+		/* find previous selected */
+		current= current->prev;
+		while(current && (current->flag & NODE_SELECT)==0)
+			current= current->prev;
+		
+		/* find first unselected */
+		if(current==NULL)
+			current= last;
+		
+		return node;
+	}
+	else {
+		bNode *node= current;
+		
+		/* find previous unselected */
+		current= current->prev;
+		while(current && (current->flag & NODE_SELECT))
+			current= current->prev;
+		
+		return node;
+	}
+	
+	return NULL;
+}
+
+static int do_header_node(SpaceNode *snode, bNode *node, float mx, float my)
+{
+	rctf totr= node->totr;
+	
+	totr.ymin= totr.ymax-20.0f;
+	
+	totr.xmax= totr.xmin+15.0f;
+	if(BLI_in_rctf(&totr, mx, my)) {
+		node->flag |= NODE_HIDDEN;
+		// allqueue(REDRAWNODE, 0);
+		return 1;
+	}	
+	
+	totr.xmax= node->totr.xmax;
+	totr.xmin= totr.xmax-18.0f;
+	if(node->typeinfo->flag & NODE_PREVIEW) {
+		if(BLI_in_rctf(&totr, mx, my)) {
+			node->flag ^= NODE_PREVIEW;
+			// allqueue(REDRAWNODE, 0);
+			return 1;
+		}
+		totr.xmin-=18.0f;
+	}
+	if(node->type == NODE_GROUP) {
+		if(BLI_in_rctf(&totr, mx, my)) {
+			snode_make_group_editable(snode, node);
+			return 1;
+		}
+		totr.xmin-=18.0f;
+	}
+	if(node->typeinfo->flag & NODE_OPTIONS) {
+		if(BLI_in_rctf(&totr, mx, my)) {
+			node->flag ^= NODE_OPTIONS;
+			// allqueue(REDRAWNODE, 0);
+			return 1;
+		}
+		totr.xmin-=18.0f;
+	}
+	/* hide unused sockets */
+	if(BLI_in_rctf(&totr, mx, my)) {
+		// XXX node_hide_unhide_sockets(snode, node);
+	}
+	
+	
+	totr= node->totr;
+	totr.xmin= totr.xmax-10.0f;
+	totr.ymax= totr.ymin+10.0f;
+	if(BLI_in_rctf(&totr, mx, my)) {
+		// XXX scale_node(snode, node);
+		return 1;
+	}
+	return 0;
+}
+
+static int do_header_hidden_node(SpaceNode *snode, bNode *node, float mx, float my)
+{
+	rctf totr= node->totr;
+	
+	totr.xmax= totr.xmin+15.0f;
+	if(BLI_in_rctf(&totr, mx, my)) {
+		node->flag &= ~NODE_HIDDEN;
+		// allqueue(REDRAWNODE, 0);
+		return 1;
+	}	
+	
+	totr.xmax= node->totr.xmax;
+	totr.xmin= node->totr.xmax-15.0f;
+	if(BLI_in_rctf(&totr, mx, my)) {
+		scale_node(snode, node);
+		return 1;
+	}
+	return 0;
+}
+
+static node_mouse_select(SpaceNode *snode, ARegion *ar, short *mval)
+{
+	bNode *node;
+	float mx, my;
+	
+	mx= (float)mval[0];
+	my= (float)mval[1];
+	
+	UI_view2d_region_to_view(&ar->v2d, mval[0], mval[1], &mx, &my);
+	
+	for(next_node(snode->edittree); (node=next_node(NULL));) {
+		
+		/* first check for the headers or scaling widget */
+		/* XXX if(node->flag & NODE_HIDDEN) {
+			if(do_header_hidden_node(snode, node, mx, my))
+				return 1;
+		}
+		else {
+			if(do_header_node(snode, node, mx, my))
+				return 1;
+		}*/
+		
+		/* node body */
+		if(BLI_in_rctf(&node->totr, mx, my))
+			break;
+	}
+	if(node) {
+		// XXX if((G.qual & LR_SHIFTKEY)==0)
+		//	node_deselectall(snode, 0);
+		
+		// XXX
+		/*
+		if(G.qual & LR_SHIFTKEY) {
+			if(node->flag & SELECT)
+				node->flag &= ~SELECT;
+			else
+				node->flag |= SELECT;
+		}
+		else */
+			node->flag |= SELECT;
+		
+		node_set_active(snode, node);
+		
+		/* viewer linking */
+		//if(G.qual & LR_CTRLKEY)
+		//	node_link_viewer(snode, node);
+		
+		/* not so nice (no event), but function below delays redraw otherwise */
+		//force_draw(0);
+		
+		//std_rmouse_transform(node_transform_ext);	/* does undo push for select */
+		
+		return 1;
+	}
+	return 0;
+}
+
+static int node_select_exec(bContext *C, wmOperator *op)
+{
+	SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
+	ScrArea *sa= CTX_wm_area(C);
+	ARegion *ar= CTX_wm_region(C);
+	int select_type;
+	short mval[2];
+
+	select_type = RNA_enum_get(op->ptr, "select_type");
+	
+	switch (select_type) {
+		case NODE_SELECT_MOUSE:
+			mval[0] = RNA_int_get(op->ptr, "mx");
+			mval[1] = RNA_int_get(op->ptr, "my");
+			node_mouse_select(snode, ar, mval);
+			break;
+	}
+	return OPERATOR_FINISHED;
+}
+
+static int node_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	ScrArea *sa= CTX_wm_area(C);
+	ARegion *ar= CTX_wm_region(C);
+	short mval[2];	
+	
+	mval[0]= event->x - ar->winrct.xmin;
+	mval[1]= event->y - ar->winrct.ymin;
+	
+	RNA_int_set(op->ptr, "mx", mval[0]);
+	RNA_int_set(op->ptr, "my", mval[1]);
+
+	return node_select_exec(C,op);
+}
+
+/* operators */
+
+static EnumPropertyItem prop_select_items[] = {
+	{NODE_SELECT_MOUSE, "NORMAL", "Normal Select", "Select using the mouse"},
+	{0, NULL, NULL, NULL}};
+
+void NODE_OT_select(wmOperatorType *ot)
+{
+	PropertyRNA *prop;
+	
+	/* identifiers */
+	ot->name= "Activate/Select";
+	ot->idname= "NODE_OT_select";
+	
+	/* api callbacks */
+	ot->invoke= node_select_invoke;
+	ot->poll= ED_operator_node_active;
+	
+	prop = RNA_def_property(ot->srna, "select_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_items(prop, prop_select_items);
+	
+	prop = RNA_def_property(ot->srna, "mx", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(ot->srna, "my", PROP_INT, PROP_NONE);
+}

source/blender/editors/space_node/space_node.c

@@ -158,16 +158,6 @@ static void node_main_area_draw(const bContext *C, ARegion *ar)
 	
 }
 
-void node_operatortypes(void)
-{
-	
-}
-
-void node_keymap(struct wmWindowManager *wm)
-{
-	
-}
-
 /* add handlers, stuff you only do once or on area/region changes */
 static void node_header_area_init(wmWindowManager *wm, ARegion *ar)
 {
@@ -199,6 +189,17 @@ static void node_header_area_draw(const bContext *C, ARegion *ar)
 static void node_main_area_listener(ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
+	switch(wmn->category) {
+		case NC_SCENE:
+			ED_region_tag_redraw(ar);
+			break;
+		case NC_MATERIAL:
+			ED_region_tag_redraw(ar);
+			break;
+		case ND_NODES:
+			ED_region_tag_redraw(ar);
+			break;
+	}
 }
 
 /* only called once, from space/spacetypes.c */
@@ -222,7 +223,7 @@ void ED_spacetype_node(void)
 	art->init= node_main_area_init;
 	art->draw= node_main_area_draw;
 	art->listener= node_main_area_listener;
-	art->keymapflag= ED_KEYMAP_VIEW2D;
+	art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D;
 
 	BLI_addhead(&st->regiontypes, art);
 	

source/blender/editors/space_view3d/space_view3d.c

@@ -291,7 +291,7 @@ static int view3d_context(const bContext *C, const bContextDataMember *member, b
 /* only called once, from space/spacetypes.c */
 void ED_spacetype_view3d(void)
 {
-	SpaceType *st= MEM_callocN(sizeof(SpaceType), "spacetype time");
+	SpaceType *st= MEM_callocN(sizeof(SpaceType), "spacetype view3d");
 	ARegionType *art;
 	
 	st->spaceid= SPACE_VIEW3D;
@@ -305,7 +305,7 @@ void ED_spacetype_view3d(void)
 	st->context= view3d_context;
 	
 	/* regions: main window */
-	art= MEM_callocN(sizeof(ARegionType), "spacetype time region");
+	art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region");
 	art->regionid = RGN_TYPE_WINDOW;
 	art->draw= view3d_main_area_draw;
 	art->init= view3d_main_area_init;
@@ -313,7 +313,7 @@ void ED_spacetype_view3d(void)
 	BLI_addhead(&st->regiontypes, art);
 	
 	/* regions: header */
-	art= MEM_callocN(sizeof(ARegionType), "spacetype time region");
+	art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region");
 	art->regionid = RGN_TYPE_HEADER;
 	art->minsizey= HEADERY;
 	art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D;