[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel BKE_library.h BKE_main.h BKE_material.h BKE_node.h blender/source/blender/blenkernel/intern library.c material.c node.c node_shaders.c blender/source/blender/blenloader/intern readblenentry.c readfile.c ...

Mon Jan 2 14:06:06 CET 2006

ton (Ton Roosendaal) 2006/01/02 14:06:06 CET

  Modified files:        (Branch: orange)
    blender/source/blender/blenkernel BKE_library.h BKE_main.h 
                                      BKE_material.h BKE_node.h 
    blender/source/blender/blenkernel/intern library.c material.c 
                                             node.c node_shaders.c 
    blender/source/blender/blenloader/intern readblenentry.c 
                                             readfile.c 
                                             writefile.c 
    blender/source/blender/include BIF_resources.h BSE_node.h 
    blender/source/blender/makesdna DNA_ID.h DNA_node_types.h 
                                    DNA_space_types.h 
    blender/source/blender/render/extern/include render.h 
    blender/source/blender/render/intern/source rendercore.c 
    blender/source/blender/renderconverter/intern 
                                                  convertBlenderScene.c 
    blender/source/blender/src blenderbuttons.c drawnode.c 
                               editnode.c filesel.c 
                               previewrender.c resources.c toets.c 
                               usiblender.c 

  Log:
  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!

  Revision  Changes    Path
  1.7.2.1   +3 -3      blender/source/blender/blenkernel/BKE_library.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/BKE_library.h.diff?r1=1.7.2.0&r2=1.7.2.1&cvsroot=bf-blender>
  1.7.2.1   +4 -3      blender/source/blender/blenkernel/BKE_main.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/BKE_main.h.diff?r1=1.7.2.0&r2=1.7.2.1&cvsroot=bf-blender>
  1.5.2.2   +5 -3      blender/source/blender/blenkernel/BKE_material.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/BKE_material.h.diff?r1=1.5.2.1&r2=1.5.2.2&cvsroot=bf-blender>
  1.1.2.8   +29 -4     blender/source/blender/blenkernel/Attic/BKE_node.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/Attic/BKE_node.h.diff?r1=1.1.2.7&r2=1.1.2.8&cvsroot=bf-blender>
  1.15.2.4  +23 -17    blender/source/blender/blenkernel/intern/library.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/library.c.diff?r1=1.15.2.3&r2=1.15.2.4&cvsroot=bf-blender>
  1.32.2.8  +44 -16    blender/source/blender/blenkernel/intern/material.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/material.c.diff?r1=1.32.2.7&r2=1.32.2.8&cvsroot=bf-blender>
  1.1.2.8   +627 -41   blender/source/blender/blenkernel/intern/Attic/node.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/Attic/node.c.diff?r1=1.1.2.7&r2=1.1.2.8&cvsroot=bf-blender>
  1.1.2.6   +4 -2      blender/source/blender/blenkernel/intern/Attic/node_shaders.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/Attic/node_shaders.c.diff?r1=1.1.2.5&r2=1.1.2.6&cvsroot=bf-blender>
  1.10.2.2  +1 -0      blender/source/blender/blenloader/intern/readblenentry.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/readblenentry.c.diff?r1=1.10.2.1&r2=1.10.2.2&cvsroot=bf-blender>
  1.214.2.27 +136 -86   blender/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/readfile.c.diff?r1=1.214.2.26&r2=1.214.2.27&cvsroot=bf-blender>
  1.60.2.7  +21 -10    blender/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/writefile.c.diff?r1=1.60.2.6&r2=1.60.2.7&cvsroot=bf-blender>
  1.48.2.6  +2 -2      blender/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_resources.h.diff?r1=1.48.2.5&r2=1.48.2.6&cvsroot=bf-blender>
  1.1.2.5   +2 -0      blender/source/blender/include/Attic/BSE_node.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/Attic/BSE_node.h.diff?r1=1.1.2.4&r2=1.1.2.5&cvsroot=bf-blender>
  1.10.2.2  +2 -1      blender/source/blender/makesdna/DNA_ID.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_ID.h.diff?r1=1.10.2.1&r2=1.10.2.2&cvsroot=bf-blender>
  1.1.2.9   +28 -6     blender/source/blender/makesdna/Attic/DNA_node_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/Attic/DNA_node_types.h.diff?r1=1.1.2.8&r2=1.1.2.9&cvsroot=bf-blender>
  1.38.2.7  +2 -2      blender/source/blender/makesdna/DNA_space_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_space_types.h.diff?r1=1.38.2.6&r2=1.38.2.7&cvsroot=bf-blender>
  1.18.2.5  +2 -0      blender/source/blender/render/extern/include/render.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/extern/include/render.h.diff?r1=1.18.2.4&r2=1.18.2.5&cvsroot=bf-blender>
  1.126.2.19 +37 -60    blender/source/blender/render/intern/source/rendercore.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/rendercore.c.diff?r1=1.126.2.18&r2=1.126.2.19&cvsroot=bf-blender>
  1.178.2.12 +4 -1      blender/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.178.2.11&r2=1.178.2.12&cvsroot=bf-blender>
  1.32.2.6  +1544 -1535blender/source/blender/src/blenderbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/blenderbuttons.c.diff?r1=1.32.2.5&r2=1.32.2.6&cvsroot=bf-blender>
  1.1.2.13  +402 -152  blender/source/blender/src/Attic/drawnode.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/Attic/drawnode.c.diff?r1=1.1.2.12&r2=1.1.2.13&cvsroot=bf-blender>
  1.1.2.12  +345 -90   blender/source/blender/src/Attic/editnode.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/Attic/editnode.c.diff?r1=1.1.2.11&r2=1.1.2.12&cvsroot=bf-blender>
  1.68.2.5  +3 -1      blender/source/blender/src/filesel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/filesel.c.diff?r1=1.68.2.4&r2=1.68.2.5&cvsroot=bf-blender>
  1.61.2.10 +27 -46    blender/source/blender/src/previewrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/previewrender.c.diff?r1=1.61.2.9&r2=1.61.2.10&cvsroot=bf-blender>
  1.52.2.4  +3 -3      blender/source/blender/src/resources.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/resources.c.diff?r1=1.52.2.3&r2=1.52.2.4&cvsroot=bf-blender>
  1.66.2.3  +3 -1      blender/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/toets.c.diff?r1=1.66.2.2&r2=1.66.2.3&cvsroot=bf-blender>
  1.97.2.4  +1 -1      blender/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/usiblender.c.diff?r1=1.97.2.3&r2=1.97.2.4&cvsroot=bf-blender>