2012-08-01 19:11:17 +00:00
|
|
|
/*
|
|
|
|
* ***** 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2005 Blender Foundation.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* The Original Code is: all of this file.
|
|
|
|
*
|
|
|
|
* Contributor(s): David Millan Escriva, Juho Vepsäläinen, Nathan Letwory
|
|
|
|
*
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
*/
|
|
|
|
|
2012-08-22 16:44:32 +00:00
|
|
|
/** \file blender/editors/space_node/node_add.c
|
2012-08-01 19:11:17 +00:00
|
|
|
* \ingroup spnode
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
2012-11-04 11:57:49 +00:00
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
2012-08-01 19:11:17 +00:00
|
|
|
#include "DNA_node_types.h"
|
|
|
|
|
2012-11-04 11:57:49 +00:00
|
|
|
#include "BLI_listbase.h"
|
2012-08-01 19:11:17 +00:00
|
|
|
#include "BLI_math.h"
|
|
|
|
|
2012-10-26 17:32:50 +00:00
|
|
|
#include "BLF_translation.h"
|
|
|
|
|
2012-08-01 19:11:17 +00:00
|
|
|
#include "BKE_context.h"
|
|
|
|
#include "BKE_image.h"
|
|
|
|
#include "BKE_library.h"
|
|
|
|
#include "BKE_main.h"
|
|
|
|
#include "BKE_node.h"
|
|
|
|
#include "BKE_report.h"
|
|
|
|
|
2012-08-01 20:39:14 +00:00
|
|
|
#include "ED_node.h" /* own include */
|
2012-08-01 19:11:17 +00:00
|
|
|
#include "ED_screen.h"
|
|
|
|
#include "ED_render.h"
|
|
|
|
|
|
|
|
#include "RNA_access.h"
|
|
|
|
#include "RNA_define.h"
|
|
|
|
#include "RNA_enum_types.h"
|
|
|
|
|
|
|
|
#include "WM_api.h"
|
|
|
|
#include "WM_types.h"
|
|
|
|
|
|
|
|
#include "UI_view2d.h"
|
|
|
|
|
2012-08-01 20:39:14 +00:00
|
|
|
#include "node_intern.h" /* own include */
|
2012-08-01 19:11:17 +00:00
|
|
|
|
|
|
|
/* can be called from menus too, but they should do own undopush and redraws */
|
|
|
|
bNode *node_add_node(SpaceNode *snode, Main *bmain, Scene *scene,
|
|
|
|
bNodeTemplate *ntemp, float locx, float locy)
|
|
|
|
{
|
|
|
|
bNode *node = NULL, *gnode;
|
|
|
|
|
|
|
|
node_deselect_all(snode);
|
|
|
|
|
|
|
|
node = nodeAddNode(snode->edittree, ntemp);
|
|
|
|
|
|
|
|
/* generics */
|
|
|
|
if (node) {
|
|
|
|
node_select(node);
|
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
/* node location is mapped */
|
|
|
|
locx /= UI_DPI_FAC;
|
|
|
|
locy /= UI_DPI_FAC;
|
|
|
|
|
2012-08-01 19:11:17 +00:00
|
|
|
gnode = node_tree_get_editgroup(snode->nodetree);
|
|
|
|
// arbitrary y offset of 60 so its visible
|
|
|
|
if (gnode) {
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
node_from_view(gnode, locx, locy + 60.0f, &node->locx, &node->locy);
|
2012-08-01 19:11:17 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
node->locx = locx;
|
|
|
|
node->locy = locy + 60.0f;
|
|
|
|
}
|
|
|
|
|
|
|
|
ntreeUpdateTree(snode->edittree);
|
|
|
|
ED_node_set_active(bmain, snode->edittree, node);
|
|
|
|
|
|
|
|
if (snode->nodetree->type == NTREE_COMPOSIT) {
|
|
|
|
if (ELEM4(node->type, CMP_NODE_R_LAYERS, CMP_NODE_COMPOSITE, CMP_NODE_DEFOCUS, CMP_NODE_OUTPUT_FILE)) {
|
|
|
|
node->id = &scene->id;
|
|
|
|
}
|
|
|
|
else if (ELEM3(node->type, CMP_NODE_MOVIECLIP, CMP_NODE_MOVIEDISTORTION, CMP_NODE_STABILIZE2D)) {
|
|
|
|
node->id = (ID *)scene->clip;
|
|
|
|
}
|
|
|
|
|
|
|
|
ntreeCompositForceHidden(snode->edittree, scene);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (node->id)
|
|
|
|
id_us_plus(node->id);
|
|
|
|
|
|
|
|
|
|
|
|
if (snode->flag & SNODE_USE_HIDDEN_PREVIEW)
|
|
|
|
node->flag &= ~NODE_PREVIEW;
|
|
|
|
|
|
|
|
snode_update(snode, node);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (snode->nodetree->type == NTREE_TEXTURE) {
|
|
|
|
ntreeTexCheckCyclics(snode->edittree);
|
|
|
|
}
|
|
|
|
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ********************** Add reroute operator ***************** */
|
|
|
|
static int add_reroute_intersect_check(bNodeLink *link, float mcoords[][2], int tot, float result[2])
|
|
|
|
{
|
|
|
|
float coord_array[NODE_LINK_RESOL + 1][2];
|
|
|
|
int i, b;
|
|
|
|
|
|
|
|
if (node_link_bezier_points(NULL, NULL, link, coord_array, NODE_LINK_RESOL)) {
|
|
|
|
|
|
|
|
for (i = 0; i < tot - 1; i++)
|
|
|
|
for (b = 0; b < NODE_LINK_RESOL; b++)
|
|
|
|
if (isect_line_line_v2(mcoords[i], mcoords[i + 1], coord_array[b], coord_array[b + 1]) > 0) {
|
|
|
|
result[0] = (mcoords[i][0] + mcoords[i + 1][0]) / 2.0f;
|
|
|
|
result[1] = (mcoords[i][1] + mcoords[i + 1][1]) / 2.0f;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-11-04 11:57:49 +00:00
|
|
|
typedef struct bNodeSocketLink {
|
|
|
|
struct bNodeSocketLink *next, *prev;
|
|
|
|
|
|
|
|
struct bNodeSocket *sock;
|
|
|
|
struct bNodeLink *link;
|
|
|
|
float point[2];
|
|
|
|
} bNodeSocketLink;
|
|
|
|
|
|
|
|
static bNodeSocketLink *add_reroute_insert_socket_link(ListBase *lb, bNodeSocket *sock, bNodeLink *link, float point[2])
|
|
|
|
{
|
|
|
|
bNodeSocketLink *socklink, *prev;
|
|
|
|
|
|
|
|
socklink = MEM_callocN(sizeof(bNodeSocketLink), "socket link");
|
|
|
|
socklink->sock = sock;
|
|
|
|
socklink->link = link;
|
|
|
|
copy_v2_v2(socklink->point, point);
|
|
|
|
|
|
|
|
for (prev = lb->last; prev; prev = prev->prev) {
|
|
|
|
if (prev->sock == sock)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
BLI_insertlinkafter(lb, prev, socklink);
|
|
|
|
return socklink;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bNodeSocketLink *add_reroute_do_socket_section(bContext *C, bNodeSocketLink *socklink, int in_out)
|
|
|
|
{
|
|
|
|
SpaceNode *snode = CTX_wm_space_node(C);
|
|
|
|
bNodeTree *ntree = snode->edittree;
|
|
|
|
bNode *reroute_node = NULL;
|
|
|
|
bNodeSocket *cursock = socklink->sock;
|
|
|
|
float insert_point[2];
|
|
|
|
int num_links;
|
|
|
|
|
|
|
|
zero_v2(insert_point);
|
|
|
|
num_links = 0;
|
|
|
|
|
|
|
|
while (socklink && socklink->sock == cursock) {
|
|
|
|
if (!(socklink->link->flag & NODE_LINK_TEST)) {
|
|
|
|
socklink->link->flag |= NODE_LINK_TEST;
|
|
|
|
|
|
|
|
/* create the reroute node for this cursock */
|
|
|
|
if (!reroute_node) {
|
|
|
|
bNodeTemplate ntemp;
|
|
|
|
ntemp.type = NODE_REROUTE;
|
|
|
|
reroute_node = nodeAddNode(ntree, &ntemp);
|
|
|
|
|
|
|
|
/* add a single link to/from the reroute node to replace multiple links */
|
|
|
|
if (in_out == SOCK_OUT) {
|
|
|
|
nodeAddLink(ntree, socklink->link->fromnode, socklink->link->fromsock, reroute_node, reroute_node->inputs.first);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
nodeAddLink(ntree, reroute_node, reroute_node->outputs.first, socklink->link->tonode, socklink->link->tosock);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* insert the reroute node into the link */
|
|
|
|
if (in_out == SOCK_OUT) {
|
|
|
|
socklink->link->fromnode = reroute_node;
|
|
|
|
socklink->link->fromsock = reroute_node->outputs.first;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
socklink->link->tonode = reroute_node;
|
|
|
|
socklink->link->tosock = reroute_node->inputs.first;
|
|
|
|
}
|
|
|
|
|
|
|
|
add_v2_v2(insert_point, socklink->point);
|
2012-12-14 04:38:52 +00:00
|
|
|
num_links++;
|
2012-11-04 11:57:49 +00:00
|
|
|
}
|
|
|
|
socklink = socklink->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (num_links > 0) {
|
|
|
|
bNode *gnode = node_tree_get_editgroup(snode->nodetree);
|
|
|
|
|
|
|
|
/* average cut point from shared links */
|
|
|
|
mul_v2_fl(insert_point, 1.0f / num_links);
|
|
|
|
|
|
|
|
if (gnode) {
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
node_from_view(gnode, insert_point[0], insert_point[1], &reroute_node->locx, &reroute_node->locy);
|
2012-11-04 11:57:49 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
reroute_node->locx = insert_point[0];
|
|
|
|
reroute_node->locy = insert_point[1];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return socklink;
|
|
|
|
}
|
|
|
|
|
2012-08-01 19:11:17 +00:00
|
|
|
static int add_reroute_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
SpaceNode *snode = CTX_wm_space_node(C);
|
|
|
|
ARegion *ar = CTX_wm_region(C);
|
2012-11-04 11:57:49 +00:00
|
|
|
bNodeTree *ntree = snode->edittree;
|
2012-08-01 19:11:17 +00:00
|
|
|
float mcoords[256][2];
|
|
|
|
int i = 0;
|
2012-11-04 11:57:49 +00:00
|
|
|
|
|
|
|
/* Get the cut path */
|
2012-08-01 19:11:17 +00:00
|
|
|
RNA_BEGIN(op->ptr, itemptr, "path")
|
|
|
|
{
|
|
|
|
float loc[2];
|
|
|
|
|
|
|
|
RNA_float_get_array(&itemptr, "loc", loc);
|
|
|
|
UI_view2d_region_to_view(&ar->v2d, (short)loc[0], (short)loc[1],
|
|
|
|
&mcoords[i][0], &mcoords[i][1]);
|
|
|
|
i++;
|
|
|
|
if (i >= 256) break;
|
|
|
|
}
|
|
|
|
RNA_END;
|
|
|
|
|
|
|
|
if (i > 1) {
|
2012-11-04 11:57:49 +00:00
|
|
|
ListBase output_links, input_links;
|
2012-08-01 19:11:17 +00:00
|
|
|
bNodeLink *link;
|
2012-11-04 11:57:49 +00:00
|
|
|
bNodeSocketLink *socklink;
|
|
|
|
float insert_point[2];
|
|
|
|
|
|
|
|
/* always first */
|
|
|
|
ED_preview_kill_jobs(C);
|
|
|
|
|
|
|
|
node_deselect_all(snode);
|
|
|
|
|
|
|
|
/* Find cut links and sort them by sockets */
|
|
|
|
output_links.first = output_links.last = NULL;
|
|
|
|
input_links.first = input_links.last = NULL;
|
|
|
|
for (link = ntree->links.first; link; link = link->next) {
|
|
|
|
if (add_reroute_intersect_check(link, mcoords, i, insert_point)) {
|
|
|
|
add_reroute_insert_socket_link(&output_links, link->fromsock, link, insert_point);
|
|
|
|
add_reroute_insert_socket_link(&input_links, link->tosock, link, insert_point);
|
|
|
|
|
|
|
|
/* Clear flag */
|
|
|
|
link->flag &= ~NODE_LINK_TEST;
|
2012-08-01 19:11:17 +00:00
|
|
|
}
|
|
|
|
}
|
2012-11-04 11:57:49 +00:00
|
|
|
|
|
|
|
/* Create reroute nodes for intersected links.
|
|
|
|
* Only one reroute if links share the same input/output socket.
|
|
|
|
*/
|
|
|
|
socklink = output_links.first;
|
|
|
|
while (socklink) {
|
|
|
|
socklink = add_reroute_do_socket_section(C, socklink, SOCK_OUT);
|
|
|
|
}
|
|
|
|
socklink = input_links.first;
|
|
|
|
while (socklink) {
|
|
|
|
socklink = add_reroute_do_socket_section(C, socklink, SOCK_IN);
|
|
|
|
}
|
|
|
|
|
|
|
|
BLI_freelistN(&output_links);
|
|
|
|
BLI_freelistN(&input_links);
|
|
|
|
|
|
|
|
/* always last */
|
|
|
|
ntreeUpdateTree(ntree);
|
|
|
|
snode_notify(C, snode);
|
|
|
|
snode_dag_update(C, snode);
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
2012-08-01 19:11:17 +00:00
|
|
|
}
|
2012-11-04 11:57:49 +00:00
|
|
|
|
2012-08-01 19:11:17 +00:00
|
|
|
return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
|
|
|
|
}
|
|
|
|
|
|
|
|
void NODE_OT_add_reroute(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
PropertyRNA *prop;
|
|
|
|
|
2013-01-27 07:23:58 +00:00
|
|
|
ot->name = "Add Reroute";
|
2012-08-01 19:11:17 +00:00
|
|
|
ot->idname = "NODE_OT_add_reroute";
|
2013-02-28 15:31:20 +00:00
|
|
|
ot->description = "Add a reroute node";
|
2012-08-01 19:11:17 +00:00
|
|
|
|
|
|
|
ot->invoke = WM_gesture_lines_invoke;
|
|
|
|
ot->modal = WM_gesture_lines_modal;
|
|
|
|
ot->exec = add_reroute_exec;
|
|
|
|
ot->cancel = WM_gesture_lines_cancel;
|
|
|
|
|
|
|
|
ot->poll = ED_operator_node_active;
|
|
|
|
|
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
|
|
|
|
|
|
|
prop = RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE);
|
|
|
|
RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath);
|
|
|
|
/* internal */
|
|
|
|
RNA_def_int(ot->srna, "cursor", BC_CROSSCURSOR, 0, INT_MAX, "Cursor", "", 0, INT_MAX);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* ****************** Add File Node Operator ******************* */
|
|
|
|
|
|
|
|
static int node_add_file_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
SpaceNode *snode = CTX_wm_space_node(C);
|
|
|
|
bNode *node;
|
|
|
|
Image *ima = NULL;
|
|
|
|
bNodeTemplate ntemp;
|
|
|
|
|
|
|
|
/* check input variables */
|
|
|
|
if (RNA_struct_property_is_set(op->ptr, "filepath")) {
|
|
|
|
char path[FILE_MAX];
|
|
|
|
RNA_string_get(op->ptr, "filepath", path);
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
|
|
|
|
ima = BKE_image_load_exists(path);
|
|
|
|
|
|
|
|
if (!ima) {
|
2012-10-26 17:32:50 +00:00
|
|
|
BKE_reportf(op->reports, RPT_ERROR, "Cannot read image '%s': %s",
|
|
|
|
path, errno ? strerror(errno) : TIP_("unsupported format"));
|
2012-08-01 19:11:17 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (RNA_struct_property_is_set(op->ptr, "name")) {
|
|
|
|
char name[MAX_ID_NAME - 2];
|
|
|
|
RNA_string_get(op->ptr, "name", name);
|
|
|
|
ima = (Image *)BKE_libblock_find_name(ID_IM, name);
|
|
|
|
|
|
|
|
if (!ima) {
|
2012-10-26 17:32:50 +00:00
|
|
|
BKE_reportf(op->reports, RPT_ERROR, "Image '%s' not found", name);
|
2012-08-01 19:11:17 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
node_deselect_all(snode);
|
|
|
|
|
|
|
|
switch (snode->nodetree->type) {
|
|
|
|
case NTREE_SHADER:
|
|
|
|
ntemp.type = SH_NODE_TEX_IMAGE;
|
|
|
|
break;
|
|
|
|
case NTREE_TEXTURE:
|
|
|
|
ntemp.type = TEX_NODE_IMAGE;
|
|
|
|
break;
|
|
|
|
case NTREE_COMPOSIT:
|
|
|
|
ntemp.type = CMP_NODE_IMAGE;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
ED_preview_kill_jobs(C);
|
|
|
|
|
2012-08-08 17:37:02 +00:00
|
|
|
node = node_add_node(snode, bmain, scene, &ntemp, snode->cursor[0], snode->cursor[1]);
|
2012-08-01 19:11:17 +00:00
|
|
|
|
|
|
|
if (!node) {
|
|
|
|
BKE_report(op->reports, RPT_WARNING, "Could not add an image node");
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
node->id = (ID *)ima;
|
|
|
|
id_us_plus(node->id);
|
|
|
|
|
2012-12-04 08:10:53 +00:00
|
|
|
BKE_image_signal(ima, NULL, IMA_SIGNAL_RELOAD);
|
|
|
|
WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, ima);
|
|
|
|
|
2012-08-01 19:11:17 +00:00
|
|
|
snode_notify(C, snode);
|
|
|
|
snode_dag_update(C, snode);
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int node_add_file_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
|
|
|
{
|
|
|
|
ARegion *ar = CTX_wm_region(C);
|
|
|
|
SpaceNode *snode = CTX_wm_space_node(C);
|
|
|
|
|
|
|
|
/* convert mouse coordinates to v2d space */
|
|
|
|
UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1],
|
2012-08-08 17:37:02 +00:00
|
|
|
&snode->cursor[0], &snode->cursor[1]);
|
2012-08-01 19:11:17 +00:00
|
|
|
|
|
|
|
if (RNA_struct_property_is_set(op->ptr, "filepath") || RNA_struct_property_is_set(op->ptr, "name"))
|
|
|
|
return node_add_file_exec(C, op);
|
|
|
|
else
|
|
|
|
return WM_operator_filesel(C, op, event);
|
|
|
|
}
|
|
|
|
|
|
|
|
void NODE_OT_add_file(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "Add File Node";
|
|
|
|
ot->description = "Add a file node to the current node editor";
|
|
|
|
ot->idname = "NODE_OT_add_file";
|
|
|
|
|
|
|
|
/* callbacks */
|
|
|
|
ot->exec = node_add_file_exec;
|
|
|
|
ot->invoke = node_add_file_invoke;
|
|
|
|
ot->poll = ED_operator_node_active;
|
|
|
|
|
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
|
|
|
|
2012-08-04 12:54:27 +00:00
|
|
|
WM_operator_properties_filesel(ot, FOLDERFILE | IMAGEFILE, FILE_SPECIAL, FILE_OPENFILE,
|
|
|
|
WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); //XXX TODO, relative_path
|
2012-08-01 19:11:17 +00:00
|
|
|
RNA_def_string(ot->srna, "name", "Image", MAX_ID_NAME - 2, "Name", "Datablock name to assign");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/********************** New node tree operator *********************/
|
|
|
|
|
|
|
|
static int new_node_tree_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
SpaceNode *snode;
|
|
|
|
bNodeTree *ntree;
|
2013-02-05 12:46:15 +00:00
|
|
|
Main *bmain;
|
2012-08-01 19:11:17 +00:00
|
|
|
PointerRNA ptr, idptr;
|
|
|
|
PropertyRNA *prop;
|
|
|
|
int treetype;
|
|
|
|
char treename[MAX_ID_NAME - 2] = "NodeTree";
|
|
|
|
|
|
|
|
/* retrieve state */
|
|
|
|
snode = CTX_wm_space_node(C);
|
2013-02-05 12:46:15 +00:00
|
|
|
bmain = CTX_data_main(C);
|
2012-08-01 19:11:17 +00:00
|
|
|
|
|
|
|
if (RNA_struct_property_is_set(op->ptr, "type"))
|
|
|
|
treetype = RNA_enum_get(op->ptr, "type");
|
|
|
|
else
|
|
|
|
treetype = snode->treetype;
|
|
|
|
|
|
|
|
if (RNA_struct_property_is_set(op->ptr, "name"))
|
|
|
|
RNA_string_get(op->ptr, "name", treename);
|
|
|
|
|
2013-02-05 12:46:15 +00:00
|
|
|
ntree = ntreeAddTree(bmain, treename, treetype, 0);
|
2012-08-01 19:11:17 +00:00
|
|
|
if (!ntree)
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
|
|
|
/* hook into UI */
|
|
|
|
uiIDContextProperty(C, &ptr, &prop);
|
|
|
|
|
|
|
|
if (prop) {
|
|
|
|
RNA_id_pointer_create(&ntree->id, &idptr);
|
|
|
|
RNA_property_pointer_set(&ptr, prop, idptr);
|
|
|
|
/* RNA_property_pointer_set increases the user count,
|
|
|
|
* fixed here as the editor is the initial user.
|
|
|
|
*/
|
2012-08-22 16:44:32 +00:00
|
|
|
ntree->id.us++;
|
2012-08-01 19:11:17 +00:00
|
|
|
RNA_property_update(C, &ptr, prop);
|
|
|
|
}
|
|
|
|
else if (snode) {
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
snode->nodetree = ntree;
|
|
|
|
|
|
|
|
ED_node_tree_update(snode, scene);
|
|
|
|
}
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void NODE_OT_new_node_tree(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "New Node Tree";
|
|
|
|
ot->idname = "NODE_OT_new_node_tree";
|
|
|
|
ot->description = "Create a new node tree";
|
|
|
|
|
|
|
|
/* api callbacks */
|
|
|
|
ot->exec = new_node_tree_exec;
|
|
|
|
ot->poll = ED_operator_node_active;
|
|
|
|
|
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
|
|
|
|
|
|
|
RNA_def_enum(ot->srna, "type", nodetree_type_items, NTREE_COMPOSIT, "Tree Type", "");
|
|
|
|
RNA_def_string(ot->srna, "name", "NodeTree", MAX_ID_NAME - 2, "Name", "");
|
|
|
|
}
|