diff options
author | Ton Roosendaal <ton@blender.org> | 2006-01-02 16:06:05 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-01-02 16:06:05 +0300 |
commit | ea7538dca60ffb2d913d0600d8f0692109b4195f (patch) | |
tree | 214db95864abe4ef9abe9c9cb76c742f175a08fc /source/blender/src/resources.c | |
parent | 9710d4c84c6ecabf8eb315d4dde7017d2c68e11f (diff) |
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
Diffstat (limited to 'source/blender/src/resources.c')
-rw-r--r-- | source/blender/src/resources.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index 7429109399b..6056e0f2bd4 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -283,7 +283,7 @@ char *BIF_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) cp= ts->syntaxb; break; case TH_NODE_GENERATOR: cp= ts->syntaxv; break; - case TH_NODE_FREE: + case TH_NODE_GROUP: cp= ts->syntaxc; break; } @@ -484,7 +484,7 @@ void BIF_InitTheme(void) SETCOL(btheme->tnode.syntaxn, 95, 110, 145, 255); /* in/output */ SETCOL(btheme->tnode.syntaxb, 135, 125, 120, 255); /* operator */ SETCOL(btheme->tnode.syntaxv, 120, 120, 120, 255); /* generator */ - SETCOL(btheme->tnode.syntaxc, 120, 120, 120, 255); /* free */ + SETCOL(btheme->tnode.syntaxc, 120, 145, 120, 255); /* group */ } @@ -619,7 +619,7 @@ char *BIF_ThemeColorsPup(int spacetype) sprintf(str, "In/Out Node %%x%d|", TH_NODE_IN_OUT); strcat(cp, str); sprintf(str, "Generator Node %%x%d|", TH_NODE_GENERATOR); strcat(cp, str); sprintf(str, "Operator Node %%x%d|", TH_NODE_OPERATOR); strcat(cp, str); -// sprintf(str, " %%x%d|", TH_NODE_FREE); strcat(cp, str); + sprintf(str, "Group Node %%x%d|", TH_NODE_GROUP); strcat(cp, str); } } return cp; |