[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel BKE_node.h BKE_texture.h blender/source/blender/blenkernel/intern material.c node.c node_shaders.c texture.c blender/source/blender/blenloader/intern readfile.c writefile.c blender/source/blender/include BIF_glutil.h ...

Wed Dec 28 16:42:55 CET 2005

ton (Ton Roosendaal) 2005/12/28 16:42:52 CET

  Modified files:        (Branch: orange)
    blender/source/blender/blenkernel BKE_node.h BKE_texture.h 
    blender/source/blender/blenkernel/intern material.c node.c 
                                             node_shaders.c 
                                             texture.c 
    blender/source/blender/blenloader/intern readfile.c 
                                             writefile.c 
    blender/source/blender/include BIF_glutil.h BIF_interface.h 
                                   BIF_interface_icons.h 
                                   BIF_previewrender.h 
                                   BIF_resources.h BSE_node.h 
                                   blendef.h butspace.h 
                                   interface.h 
    blender/source/blender/makesdna DNA_material_types.h 
                                    DNA_node_types.h 
                                    DNA_space_types.h 
                                    DNA_userdef_types.h 
    blender/source/blender/render/extern/include render.h 
                                                 render_types.h 
    blender/source/blender/render/intern/source ray.c rendercore.c 
                                                texture.c 
    blender/source/blender/src blenderbuttons.c butspace.c 
                               buttons_shading.c drawimage.c 
                               drawnode.c drawseq.c drawview.c 
                               edit.c editnode.c editview.c 
                               glutil.c header_buttonswin.c 
                               header_info.c header_ipo.c 
                               header_node.c headerbuttons.c 
                               interface.c interface_draw.c 
                               interface_icons.c interface_panel.c 
                               outliner.c previewrender.c 
                               renderwin.c resources.c space.c 
                               usiblender.c 

  Log:
  Christmas coding work!

  ********* Node editor work:

  - To enable Nodes for Materials, you have to set the "Use Nodes"
    button, in the new Material buttons "Nodes" Panel or in header
    of the Node editor. Doing this will disable Material-Layers.

  - Nodes now execute materials ("shaders"), but still only using the
    previewrender code.

  - Nodes have (optional) previews for rendered images.

  - Node headers allow to hide buttons and/or preview image

  - Nodes can be dragged larger/smaller (right-bottom corner)

  - Nodes can be hidden (minimized) with hotkey H

  - CTRL+click on an Input Socket gives a popup with default values.

  - Changing Material/Texture or Mix node will adjust Node title.

  - Click-drag outside of a Node changes cursor to "Knife' and allows to
    draw a rect where to cut Links.

  - Added new node types RGBtoBW, Texture, In/Output, ColorRamp

  - Material Nodes have options to ouput diffuse or specular, or to use
    a negative normal. The input socket 'Normal' will force the material
    to use that normal, otherwise it uses the normal from the Material
    that has the node tree.

  - When drawing a link between two not-matching sockets, Blender inserts
    a converting node (now only for value/rgb combos)

  - When drawing a link to an input socket that's already in use, the
    old link will either disappear or flip to another unused socket.

  - A click on a Material Node will activate it, and show all its settings
    in the Material Buttons. Active Material Nodes draw the material icon
    in red.

  - A click on any node will show its options in the Node Panel in the
    Material buttons.

  - Multiple Output Nodes can be used, to sample contents of a tree, but
    only one Output is the real one, which is indicated in a different
    color and red material icon.

  - Added ThemeColors for node types

  - ALT+C will convert existing Material-Layers to Node... this currently
    only adds the material/mix nodes and connects them. Dunno if this is
    worth a lot of coding work to make perfect?

  - Press C to call another "Solve order", which will show all possible
    cyclic conflicts (if there are).

  - Technical: nodes now use "Type" structs which define the
    structure of nodes and in/output sockets. The Type structs store all
    fixed info, callbacks, and allow to reconstruct saved Nodes to match
    what is required by Blender.

  - Defining (new) nodes now is as simple as filling in a fixed
    Type struct, plus code some callbacks. A doc will be made!

  - Node preview images are by default float

  ********* Icon drawing:

  - Cleanup of how old icons were implemented in new system, making
    them 16x16 too, correctly centered *and* scaled.

  - Made drawing Icons use float coordinates

  - Moved BIF_calcpreview_image() into interface_icons.c, renamed it
    icon_from_image(). Removed a lot of unneeded Imbuf magic here! :)

  - Skipped scaling and imbuf copying when icons are OK size

  ********* Preview render:

  - Huge cleanup of code....

  - renaming BIF_xxx calls that only were used internally

  - BIF_previewrender() now accepts an argument for rendering method,
    so it supports icons, buttonwindow previewrender and node editor

  - Only a single BIF_preview_changed() call now exists, supporting all
    signals as needed for buttos and node editor

  ********* More stuff:

  - glutil.c, glaDrawPixelsSafe() and glaDrawPixelsTex() now accept format
    argument for GL_FLOAT rects

  - Made the ColorBand become a built-in button for interface.c
    Was a load of cleanup work in buttons_shading.c...

  - removed a load of unneeded glBlendFunc() calls

  - Fixed bug in calculating text length for buttons (ancient!)

  Revision  Changes    Path
  1.1.2.5   +90 -17    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.4&r2=1.1.2.5&cvsroot=bf-blender>
  1.8.2.1   +2 -2      blender/source/blender/blenkernel/BKE_texture.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/BKE_texture.h.diff?r1=1.8.2.0&r2=1.8.2.1&cvsroot=bf-blender>
  1.32.2.6  +25 -6     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.5&r2=1.32.2.6&cvsroot=bf-blender>
  1.1.2.5   +391 -49   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.4&r2=1.1.2.5&cvsroot=bf-blender>
  1.1.2.2   +400 -140  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.1&r2=1.1.2.2&cvsroot=bf-blender>
  1.28.2.2  +25 -11    blender/source/blender/blenkernel/intern/texture.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/texture.c.diff?r1=1.28.2.1&r2=1.28.2.2&cvsroot=bf-blender>
  1.214.2.25 +81 -9     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.24&r2=1.214.2.25&cvsroot=bf-blender>
  1.60.2.6  +34 -3     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.5&r2=1.60.2.6&cvsroot=bf-blender>
  1.11.2.1  +4 -4      blender/source/blender/include/BIF_glutil.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_glutil.h.diff?r1=1.11.2.0&r2=1.11.2.1&cvsroot=bf-blender>
  1.38.2.3  +1 -0      blender/source/blender/include/BIF_interface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_interface.h.diff?r1=1.38.2.2&r2=1.38.2.3&cvsroot=bf-blender>
  1.1.2.2   +3 -3      blender/source/blender/include/Attic/BIF_interface_icons.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/Attic/BIF_interface_icons.h.diff?r1=1.1.2.1&r2=1.1.2.2&cvsroot=bf-blender>
  1.7.2.2   +19 -16    blender/source/blender/include/BIF_previewrender.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_previewrender.h.diff?r1=1.7.2.1&r2=1.7.2.2&cvsroot=bf-blender>
  1.48.2.5  +10 -4     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.4&r2=1.48.2.5&cvsroot=bf-blender>
  1.1.2.4   +16 -7     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.3&r2=1.1.2.4&cvsroot=bf-blender>
  1.48.2.4  +2 -1      blender/source/blender/include/blendef.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/blendef.h.diff?r1=1.48.2.3&r2=1.48.2.4&cvsroot=bf-blender>
  1.69.2.5  +24 -16    blender/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/butspace.h.diff?r1=1.69.2.4&r2=1.69.2.5&cvsroot=bf-blender>
  1.27.2.2  +2 -0      blender/source/blender/include/interface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/interface.h.diff?r1=1.27.2.1&r2=1.27.2.2&cvsroot=bf-blender>
  1.30.2.9  +5 -3      blender/source/blender/makesdna/DNA_material_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_material_types.h.diff?r1=1.30.2.8&r2=1.30.2.9&cvsroot=bf-blender>
  1.1.2.6   +42 -20    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.5&r2=1.1.2.6&cvsroot=bf-blender>
  1.38.2.5  +6 -4      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.4&r2=1.38.2.5&cvsroot=bf-blender>
  1.51.2.2  +5 -4      blender/source/blender/makesdna/DNA_userdef_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_userdef_types.h.diff?r1=1.51.2.1&r2=1.51.2.2&cvsroot=bf-blender>
  1.18.2.4  +1 -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.3&r2=1.18.2.4&cvsroot=bf-blender>
  1.34.2.5  +2 -1      blender/source/blender/render/extern/include/render_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/extern/include/render_types.h.diff?r1=1.34.2.4&r2=1.34.2.5&cvsroot=bf-blender>
  1.63.2.6  +2 -2      blender/source/blender/render/intern/source/ray.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/ray.c.diff?r1=1.63.2.5&r2=1.63.2.6&cvsroot=bf-blender>
  1.126.2.17 +6 -5      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.16&r2=1.126.2.17&cvsroot=bf-blender>
  1.53.2.6  +2 -2      blender/source/blender/render/intern/source/texture.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/texture.c.diff?r1=1.53.2.5&r2=1.53.2.6&cvsroot=bf-blender>
  1.32.2.4  +1420 -1432blender/source/blender/src/blenderbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/blenderbuttons.c.diff?r1=1.32.2.3&r2=1.32.2.4&cvsroot=bf-blender>
  1.41.2.3  +21 -3     blender/source/blender/src/butspace.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/butspace.c.diff?r1=1.41.2.2&r2=1.41.2.3&cvsroot=bf-blender>
  1.157.2.15 +299 -461  blender/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_shading.c.diff?r1=1.157.2.14&r2=1.157.2.15&cvsroot=bf-blender>
  1.47.2.3  +4 -4      blender/source/blender/src/drawimage.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawimage.c.diff?r1=1.47.2.2&r2=1.47.2.3&cvsroot=bf-blender>
  1.1.2.5   +531 -103  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.4&r2=1.1.2.5&cvsroot=bf-blender>
  1.38.2.1  +2 -2      blender/source/blender/src/drawseq.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawseq.c.diff?r1=1.38.2.0&r2=1.38.2.1&cvsroot=bf-blender>
  1.181.2.11 +1 -1      blender/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawview.c.diff?r1=1.181.2.10&r2=1.181.2.11&cvsroot=bf-blender>
  1.80.2.3  +50 -47    blender/source/blender/src/edit.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/edit.c.diff?r1=1.80.2.2&r2=1.80.2.3&cvsroot=bf-blender>
  1.1.2.6   +568 -171  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.5&r2=1.1.2.6&cvsroot=bf-blender>
  1.87.2.3  +3 -1      blender/source/blender/src/editview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editview.c.diff?r1=1.87.2.2&r2=1.87.2.3&cvsroot=bf-blender>
  1.21.2.1  +22 -12    blender/source/blender/src/glutil.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/glutil.c.diff?r1=1.21.2.0&r2=1.21.2.1&cvsroot=bf-blender>
  1.38.2.3  +2 -2      blender/source/blender/src/header_buttonswin.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_buttonswin.c.diff?r1=1.38.2.2&r2=1.38.2.3&cvsroot=bf-blender>
  1.74.2.3  +2 -2      blender/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_info.c.diff?r1=1.74.2.2&r2=1.74.2.3&cvsroot=bf-blender>
  1.37.2.1  +2 -2      blender/source/blender/src/header_ipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_ipo.c.diff?r1=1.37.2.0&r2=1.37.2.1&cvsroot=bf-blender>
  1.1.2.2   +40 -4     blender/source/blender/src/Attic/header_node.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/Attic/header_node.c.diff?r1=1.1.2.1&r2=1.1.2.2&cvsroot=bf-blender>
  1.120.2.3 +11 -10    blender/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/headerbuttons.c.diff?r1=1.120.2.2&r2=1.120.2.3&cvsroot=bf-blender>
  1.217.2.5 +148 -30   blender/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/interface.c.diff?r1=1.217.2.4&r2=1.217.2.5&cvsroot=bf-blender>
  1.48.2.3  +143 -42   blender/source/blender/src/interface_draw.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/interface_draw.c.diff?r1=1.48.2.2&r2=1.48.2.3&cvsroot=bf-blender>
  1.1.2.4   +78 -42    blender/source/blender/src/Attic/interface_icons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/Attic/interface_icons.c.diff?r1=1.1.2.3&r2=1.1.2.4&cvsroot=bf-blender>
  1.33.2.3  +3 -14     blender/source/blender/src/interface_panel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/interface_panel.c.diff?r1=1.33.2.2&r2=1.33.2.3&cvsroot=bf-blender>
  1.58.2.9  +3 -2      blender/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/outliner.c.diff?r1=1.58.2.8&r2=1.58.2.9&cvsroot=bf-blender>
  1.61.2.7  +258 -272  blender/source/blender/src/previewrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/previewrender.c.diff?r1=1.61.2.6&r2=1.61.2.7&cvsroot=bf-blender>
  1.59.2.4  +8 -8      blender/source/blender/src/renderwin.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/renderwin.c.diff?r1=1.59.2.3&r2=1.59.2.4&cvsroot=bf-blender>
  1.52.2.2  +32 -1     blender/source/blender/src/resources.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/resources.c.diff?r1=1.52.2.1&r2=1.52.2.2&cvsroot=bf-blender>
  1.317.2.12 +4 -6      blender/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/space.c.diff?r1=1.317.2.11&r2=1.317.2.12&cvsroot=bf-blender>
  1.97.2.1  +20 -5     blender/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/usiblender.c.diff?r1=1.97.2.0&r2=1.97.2.1&cvsroot=bf-blender>