Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feedback #353

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Feedback #353

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a96b8a3
Added port type "previous", that collects node output in the previous…
stebanos May 16, 2013
d092b15
Make sure that a node which input is used for a next frame is always …
stebanos May 16, 2013
2282ca1
Explicit checking if clojure var object is a function.
Jun 5, 2013
82af713
Merge branch 'master' into feedback
Jun 5, 2013
e4a7f1e
Connections now have an attribute specifying whether they connect to …
Jun 10, 2013
2d0f7ac
Feedback connections can now be disconnected in the viewer.
stebanos Jun 11, 2013
cbf094e
Now the full render results are stored per node in the NodeContext.
Jun 13, 2013
347bd2b
Merge branch 'master' into feedback
Jun 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Feedback connections can now be disconnected in the viewer.
  • Loading branch information
@stebanos
stebanos committed Jun 11, 2013
commit 2d0f7ac0f3a00fc7dce4232ef8b7276193be4a6c
3 changes: 2 additions & 1 deletion src/main/java/nodebox/client/NetworkView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,8 @@ public void mousePressed(MouseEvent e) {
connectionInput = getInputPortAt(pt);
if (connectionInput != null) {
// We're over a port, but is it connected?
Connection c = getActiveNetwork().getConnection(connectionInput.node, connectionInput.port);
Connection.Type type = isShiftPressed ? Connection.Type.FEEDBACK : Connection.Type.STANDARD;
Connection c = getActiveNetwork().getConnection(connectionInput.node, connectionInput.port, type);
// Disconnect it, but start a new connection on the same node immediately.
if (c != null) {
getDocument().disconnect(c);
Expand Down