Blender Git Loki
Git Commits -> Revision 9df1460
Revision 9df1460 by Ton Roosendaal (master) December 28, 2005, 15:42 (GMT) |
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!) |
Commit Details:
Full Hash: 9df1460777cceed839721ea99fd9623aedbb26f5
SVN Revision: 6237
Parent Commit: 7837866
Lines Changed: +4831, -2964
52 Modified Paths:
/source/blender/blenkernel/BKE_node.h (+90, -17) (Diff)
/source/blender/blenkernel/BKE_texture.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+24, -5) (Diff)
/source/blender/blenkernel/intern/node.c (+391, -49) (Diff)
/source/blender/blenkernel/intern/node_shaders.c (+389, -129) (Diff)
/source/blender/blenkernel/intern/texture.c (+24, -10) (Diff)
/source/blender/blenloader/intern/readfile.c (+80, -8) (Diff)
/source/blender/blenloader/intern/writefile.c (+34, -3) (Diff)
/source/blender/include/BIF_glutil.h (+3, -3) (Diff)
/source/blender/include/BIF_interface.h (+1, -0) (Diff)
/source/blender/include/BIF_interface_icons.h (+2, -2) (Diff)
/source/blender/include/BIF_previewrender.h (+18, -15) (Diff)
/source/blender/include/BIF_resources.h (+9, -3) (Diff)
/source/blender/include/blendef.h (+2, -1) (Diff)
/source/blender/include/BSE_node.h (+16, -7) (Diff)
/source/blender/include/butspace.h (+24, -16) (Diff)
/source/blender/include/interface.h (+2, -0) (Diff)
/source/blender/makesdna/DNA_material_types.h (+4, -2) (Diff)
/source/blender/makesdna/DNA_node_types.h (+42, -20) (Diff)
/source/blender/makesdna/DNA_space_types.h (+5, -3) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+4, -3) (Diff)
/source/blender/render/extern/include/render.h (+1, -0) (Diff)
/source/blender/render/extern/include/render_types.h (+2, -1) (Diff)
/source/blender/render/intern/source/ray.c (+2, -2) (Diff)
/source/blender/render/intern/source/rendercore.c (+5, -4) (Diff)
/source/blender/render/intern/source/texture.c (+1, -1) (Diff)
/source/blender/src/blenderbuttons.c (+1420, -1432) (Diff)
/source/blender/src/butspace.c (+21, -3) (Diff)
/source/blender/src/buttons_shading.c (+298, -460) (Diff)
/source/blender/src/drawimage.c (+4, -4) (Diff)
/source/blender/src/drawnode.c (+531, -103) (Diff)
/source/blender/src/drawseq.c (+1, -1) (Diff)
/source/blender/src/drawview.c (+1, -1) (Diff)
/source/blender/src/edit.c (+49, -46) (Diff)
/source/blender/src/editnode.c (+560, -163) (Diff)
/source/blender/src/editview.c (+3, -1) (Diff)
/source/blender/src/glutil.c (+21, -11) (Diff)
/source/blender/src/headerbuttons.c (+11, -10) (Diff)
/source/blender/src/header_buttonswin.c (+2, -2) (Diff)
/source/blender/src/header_info.c (+1, -1) (Diff)
/source/blender/src/header_ipo.c (+1, -1) (Diff)
/source/blender/src/header_node.c (+40, -4) (Diff)
/source/blender/src/interface.c (+147, -29) (Diff)
/source/blender/src/interface_draw.c (+142, -41) (Diff)
/source/blender/src/interface_icons.c (+78, -42) (Diff)
/source/blender/src/interface_panel.c (+2, -13) (Diff)
/source/blender/src/outliner.c (+3, -2) (Diff)
/source/blender/src/previewrender.c (+259, -273) (Diff)
/source/blender/src/renderwin.c (+7, -7) (Diff)
/source/blender/src/resources.c (+31, -0) (Diff)
/source/blender/src/space.c (+3, -5) (Diff)
/source/blender/src/usiblender.c (+19, -4) (Diff)
/source/blender/blenkernel/BKE_texture.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+24, -5) (Diff)
/source/blender/blenkernel/intern/node.c (+391, -49) (Diff)
/source/blender/blenkernel/intern/node_shaders.c (+389, -129) (Diff)
/source/blender/blenkernel/intern/texture.c (+24, -10) (Diff)
/source/blender/blenloader/intern/readfile.c (+80, -8) (Diff)
/source/blender/blenloader/intern/writefile.c (+34, -3) (Diff)
/source/blender/include/BIF_glutil.h (+3, -3) (Diff)
/source/blender/include/BIF_interface.h (+1, -0) (Diff)
/source/blender/include/BIF_interface_icons.h (+2, -2) (Diff)
/source/blender/include/BIF_previewrender.h (+18, -15) (Diff)
/source/blender/include/BIF_resources.h (+9, -3) (Diff)
/source/blender/include/blendef.h (+2, -1) (Diff)
/source/blender/include/BSE_node.h (+16, -7) (Diff)
/source/blender/include/butspace.h (+24, -16) (Diff)
/source/blender/include/interface.h (+2, -0) (Diff)
/source/blender/makesdna/DNA_material_types.h (+4, -2) (Diff)
/source/blender/makesdna/DNA_node_types.h (+42, -20) (Diff)
/source/blender/makesdna/DNA_space_types.h (+5, -3) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+4, -3) (Diff)
/source/blender/render/extern/include/render.h (+1, -0) (Diff)
/source/blender/render/extern/include/render_types.h (+2, -1) (Diff)
/source/blender/render/intern/source/ray.c (+2, -2) (Diff)
/source/blender/render/intern/source/rendercore.c (+5, -4) (Diff)
/source/blender/render/intern/source/texture.c (+1, -1) (Diff)
/source/blender/src/blenderbuttons.c (+1420, -1432) (Diff)
/source/blender/src/butspace.c (+21, -3) (Diff)
/source/blender/src/buttons_shading.c (+298, -460) (Diff)
/source/blender/src/drawimage.c (+4, -4) (Diff)
/source/blender/src/drawnode.c (+531, -103) (Diff)
/source/blender/src/drawseq.c (+1, -1) (Diff)
/source/blender/src/drawview.c (+1, -1) (Diff)
/source/blender/src/edit.c (+49, -46) (Diff)
/source/blender/src/editnode.c (+560, -163) (Diff)
/source/blender/src/editview.c (+3, -1) (Diff)
/source/blender/src/glutil.c (+21, -11) (Diff)
/source/blender/src/headerbuttons.c (+11, -10) (Diff)
/source/blender/src/header_buttonswin.c (+2, -2) (Diff)
/source/blender/src/header_info.c (+1, -1) (Diff)
/source/blender/src/header_ipo.c (+1, -1) (Diff)
/source/blender/src/header_node.c (+40, -4) (Diff)
/source/blender/src/interface.c (+147, -29) (Diff)
/source/blender/src/interface_draw.c (+142, -41) (Diff)
/source/blender/src/interface_icons.c (+78, -42) (Diff)
/source/blender/src/interface_panel.c (+2, -13) (Diff)
/source/blender/src/outliner.c (+3, -2) (Diff)
/source/blender/src/previewrender.c (+259, -273) (Diff)
/source/blender/src/renderwin.c (+7, -7) (Diff)
/source/blender/src/resources.c (+31, -0) (Diff)
/source/blender/src/space.c (+3, -5) (Diff)
/source/blender/src/usiblender.c (+19, -4) (Diff)