Revision: 18102
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18102
Author: jesterking
Date: 2008-12-28 01:08:34 +0100 (Sun, 28 Dec 2008)
Log Message:
-----------
2.5 / Nodes
* WIP selection operator.
- selection is made, but redraw is still missing.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_node/SConscript
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
branches/blender2.5/blender/source/blender/editors/space_node/space_node.c
branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
branches/blender2.5/blender/source/blender/editors/space_node/node_select.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/SConscript
2008-12-27 20:22:22 UTC (rev 18101)
+++ branches/blender2.5/blender/source/blender/editors/space_node/SConscript
2008-12-28 00:08:34 UTC (rev 18102)
@@ -3,7 +3,7 @@
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 = []
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
2008-12-27 20:22:22 UTC (rev 18101)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
2008-12-28 00:08:34 UTC (rev 18102)
@@ -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 @@
scrarea_queue_headredraw(sa);
}
}
+#endif /* 0 */
-
-static void node_set_active(SpaceNode *snode, bNode *node)
+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 @@
// allqueue(REDRAWIPO, 0);
}
}
+ #endif /* 0 */
}
void snode_make_group_editable(SpaceNode *snode, bNode *gnode)
@@ -718,9 +727,9 @@
if(gnode && gnode->type==NODE_GROUP && gnode->id) {
if(gnode->id->lib) {
- if(okee("Make Group Local"))
- ntreeMakeLocal((bNodeTree *)gnode->id);
- else
+ // XXX if(okee("Make Group Local"))
+ // ntreeMakeLocal((bNodeTree *)gnode->id);
+ // else
return;
}
gnode->flag |= NODE_GROUP_EDIT;
@@ -747,6 +756,8 @@
// allqueue(REDRAWNODE, 0);
}
+#if 0
+
void node_ungroup(SpaceNode *snode)
{
bNode *gnode;
@@ -1209,30 +1220,38 @@
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);
- areamouseco_to_ipoco(G.v2d, mvalo, &mxstart, &mystart);
+/* XXX getmouseco_areawin(mvalo);
+ 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 @@
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 @@
}
break;
}
- }
+ }*/
}
@@ -1284,6 +1303,8 @@
ntreeTexUpdatePreviews(snode->nodetree);
}
+#if 0
+
/* ******************** rename ******************* */
void node_rename(SpaceNode *snode)
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
2008-12-27 20:22:22 UTC (rev 18101)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
2008-12-28 00:08:34 UTC (rev 18102)
@@ -33,14 +33,26 @@
struct ARegion;
struct View2D;
struct bContext;
+struct wmWindowManager;
+/* defines */
+#define NODE_SELECT_MOUSE 1
+
+
/* node_header.c */
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 @@
/* 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 */
Added: branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
(rev 0)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
2008-12-28 00:08:34 UTC (rev 18102)
@@ -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);
+}
Property changes on:
branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
___________________________________________________________________
Name: svn:eol-style
+ LF
Added:
branches/blender2.5/blender/source/blender/editors/space_node/node_select.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_select.c
(rev 0)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_select.c
2008-12-28 00:08:34 UTC (rev 18102)
@@ -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;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
