griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
fba76712051331ab15272bcf1fe4e654775e4bdc
test/scripts/startup/bl_ui/node_add_menu_geometry.py

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

736 lines
32 KiB
Python
Raw Normal View History

License Headers: Set copyright to "Blender Authors", add AUTHORS Listing the "Blender Foundation" as copyright holder implied the Blender Foundation holds copyright to files which may include work from many developers. While keeping copyright on headers makes sense for isolated libraries, Blender's own code may be refactored or moved between files in a way that makes the per file copyright holders less meaningful. Copyright references to the "Blender Foundation" have been replaced with "Blender Authors", with the exception of `./extern/` since these this contains libraries which are more isolated, any changed to license headers there can be handled on a case-by-case basis. Some directories in `./intern/` have also been excluded: - `./intern/cycles/` it's own `AUTHORS` file is planned. - `./intern/opensubdiv/`. An "AUTHORS" file has been added, using the chromium projects authors file as a template. Design task: #110784 Ref !110783.
2023-08-16 00:20:26 +10:00
# SPDX-FileCopyrightText: 2022-2023 Blender Authors
License headers: use SPDX-FileCopyrightText in all sources
2023-06-15 13:09:04 +10:00
#
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
# SPDX-License-Identifier: GPL-2.0-or-later
License headers: use SPDX-FileCopyrightText in all sources
2023-06-15 13:09:04 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
import bpy
from bpy.types import Menu
from bl_ui import node_add_menu
I18n: disambiguate messages - "Lines" in the sense of number of lines - "Number" can mean "amount, count" or "index, offset" - "Second" can be an ordinal number or a unit - "Root": add the brush curve to the "square root falloff" sense - "Strip" can be a sequence or a type of hair rendering - "Constant" in the sense of a value, for the Geometry Nodes add submenu (#105447). Additionally, extract: - "Press a key" from the Keymap preferences. - "MaskLayer", upon new mask layer creation Ref #43295, #105447
2023-03-03 14:44:21 +01:00
from bpy.app.translations import (
pgettext_iface as iface_,
contexts as i18n_contexts,
)
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_geometry_node_GEO_ATTRIBUTE(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_ATTRIBUTE"
bl_label = "Attribute"
def draw(self, _context):
layout = self.layout
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeAttributeStatistic")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeAttributeDomainSize")
layout.separator()
Geometry Nodes: new Blur Attribute node The Blur Attribute node mixes values of neighboring elements in meshes and curves. Currently it supports points, edges and faces on meshes and points on curves. In theory, support for face corners could be added, but useful semantics are not obvious yet. The node calculates a weighted average of each element with its neighbors (based on curve/mesh topology). The weight of the element itself is always 1, and the weight of the neighbor elements is controlled by the weight input socket. In the future, more options for how different elements are weight can be added (e.g. smoothing groups and selection). The node can perform multiple blurring iterations to achieve a blurrier result. Generally, it is better to do multiple iterations in one node instead of using multiple blur nodes because it has better performance in the current implementation. We use the term "Blur" (instead of "Smooth") because smoothing is generally more related to removing roughness from surfaces. When viewing the result of the Blur Attribute node in the viewport, it looks like an image is blurred. While the node can also be used to smooth surfaces, other/better algorithms exists for that purpose (which e.g. don't reduce the volume of the mesh to zero with too many iterations). Differential Revision: https://developer.blender.org/D13952
2022-12-07 18:22:44 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeBlurAttribute")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeCaptureAttribute")
node_add_menu.add_node_type(layout, "GeometryNodeRemoveAttribute")
node_add_menu.add_node_type(layout, "GeometryNodeStoreNamedAttribute")
Nodes: Add node group assets in add menu This patch builds on the work from bdb57541475f to add node group assets directly in the node editor add menu. Assets are added after separators to distinguish them, but otherwise they look like any other node. The catalog trees from all configured libraries are used to build the menu hierarchy. Only catalogs with matching asset types are used though. There are a few limitations of this initial version. For now this only supports geometry nodes. Support for other built-in node systems just requires some refactoring of the corresponding add menu though. Lazy loading will be added in a followup commit. For now there is a label the first time the menu is opened. Like the search menu integration, re-saving asset library files in 3.4 is required, if it hasn't been done already. Implementation wise, there is a some ugly code here. A lot of that is because the asset system isn't complete. The RNA API doesn't work well yet, and the system isn't built to interact with multiple libraries at once. It's also ugly because of the way we combine automatic menu generation with builtin menus. As noted in a code comment, these two systems could be merged completely so that the menus for builtin nodes are also generated in the same way. Differential Revision: https://developer.blender.org/D16135
2022-11-01 16:09:49 +01:00
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_geometry_node_GEO_COLOR(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_COLOR"
bl_label = "Color"
def draw(self, _context):
layout = self.layout
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "ShaderNodeValToRGB")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "ShaderNodeRGBCurve")
layout.separator()
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "FunctionNodeCombineColor")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
props = node_add_menu.add_node_type(layout, "ShaderNodeMix", label=iface_("Mix Color"))
ops = props.settings.add()
ops.name = "data_type"
ops.value = "'RGBA'"
node_add_menu.add_node_type(layout, "FunctionNodeSeparateColor")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Utilties/Color")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_geometry_node_GEO_CURVE(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_CURVE"
bl_label = "Curve"
def draw(self, _context):
layout = self.layout
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.menu("NODE_MT_geometry_node_GEO_CURVE_READ")
Geometry Nodes: Tweak menu location of sample nodes There was an inconsistency between geometry sample nodes and mesh/curve sample nodes, where the latter didn't have a special "Sample" category, and we categorized as "Operations", which they were not. Also put the sample category between "Read" and "Write" since the verb name is more consistent and sampling is an advanced form of reading.
2023-02-03 16:26:30 -05:00
layout.menu("NODE_MT_geometry_node_GEO_CURVE_SAMPLE")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.menu("NODE_MT_geometry_node_GEO_CURVE_WRITE")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
layout.separator()
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.menu("NODE_MT_geometry_node_GEO_CURVE_OPERATIONS")
layout.menu("NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE")
layout.menu("NODE_MT_geometry_node_curve_topology")
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
class NODE_MT_geometry_node_GEO_CURVE_READ(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_CURVE_READ"
bl_label = "Read"
def draw(self, _context):
layout = self.layout
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeInputCurveHandlePositions")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeCurveLength")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeInputTangent")
node_add_menu.add_node_type(layout, "GeometryNodeInputCurveTilt")
node_add_menu.add_node_type(layout, "GeometryNodeCurveEndpointSelection")
node_add_menu.add_node_type(layout, "GeometryNodeCurveHandleTypeSelection")
node_add_menu.add_node_type(layout, "GeometryNodeInputSplineCyclic")
node_add_menu.add_node_type(layout, "GeometryNodeSplineLength")
node_add_menu.add_node_type(layout, "GeometryNodeSplineParameter")
node_add_menu.add_node_type(layout, "GeometryNodeInputSplineResolution")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Curve/Read")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
Cleanup: make format
2023-01-16 14:39:10 +01:00
Geometry Nodes: Tweak menu location of sample nodes There was an inconsistency between geometry sample nodes and mesh/curve sample nodes, where the latter didn't have a special "Sample" category, and we categorized as "Operations", which they were not. Also put the sample category between "Read" and "Write" since the verb name is more consistent and sampling is an advanced form of reading.
2023-02-03 16:26:30 -05:00
class NODE_MT_geometry_node_GEO_CURVE_SAMPLE(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_CURVE_SAMPLE"
bl_label = "Sample"
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeSampleCurve")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Curve/Sample")
Geometry Nodes: Tweak menu location of sample nodes There was an inconsistency between geometry sample nodes and mesh/curve sample nodes, where the latter didn't have a special "Sample" category, and we categorized as "Operations", which they were not. Also put the sample category between "Read" and "Write" since the verb name is more consistent and sampling is an advanced form of reading.
2023-02-03 16:26:30 -05:00
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_geometry_node_GEO_CURVE_WRITE(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_CURVE_WRITE"
bl_label = "Write"
def draw(self, _context):
layout = self.layout
Geometry Nodes: Set Curve Normal This node allows for curves to have their evaluated normal mode changed between MINIMUM_TWIST and Z_UP. A selection input allows for choosing which spline in the curves object will be affected. Differential Revision: D16118
2022-10-03 15:50:21 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeSetCurveNormal")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeSetCurveRadius")
node_add_menu.add_node_type(layout, "GeometryNodeSetCurveTilt")
node_add_menu.add_node_type(layout, "GeometryNodeSetCurveHandlePositions")
node_add_menu.add_node_type(layout, "GeometryNodeCurveSetHandles")
node_add_menu.add_node_type(layout, "GeometryNodeSetSplineCyclic")
node_add_menu.add_node_type(layout, "GeometryNodeSetSplineResolution")
node_add_menu.add_node_type(layout, "GeometryNodeCurveSplineType")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Curve/Write")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_geometry_node_GEO_CURVE_OPERATIONS(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_CURVE_OPERATIONS"
bl_label = "Operations"
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeCurveToMesh")
node_add_menu.add_node_type(layout, "GeometryNodeCurveToPoints")
node_add_menu.add_node_type(layout, "GeometryNodeDeformCurvesOnSurface")
node_add_menu.add_node_type(layout, "GeometryNodeFillCurve")
node_add_menu.add_node_type(layout, "GeometryNodeFilletCurve")
Geometry Nodes: new Interpolate Curves node This adds a new `Interpolate Curves` node. It allows generating new curves between a set of existing guide curves. This is essential for procedural hair. Usage: - One has to provide a set of guide curves and a set of root positions for the generated curves. New curves are created starting from these root positions. The N closest guide curves are used for the interpolation. - An additional up vector can be provided for every guide curve and root position. This is typically a surface normal or nothing. This allows generating child curves that are properly oriented based on the surface orientation. - Sometimes a point should only be interpolated using a subset of the guides. This can be achieved using the `Guide Group ID` and `Point Group ID` inputs. The curve generated at a specific point will only take the guides with the same id into account. This allows e.g. for hair parting. - The `Max Neighbors` input limits how many guide curves are taken into account for every interpolated curve. Differential Revision: https://developer.blender.org/D16642
2023-01-20 12:09:29 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeInterpolateCurves")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeResampleCurve")
node_add_menu.add_node_type(layout, "GeometryNodeReverseCurve")
node_add_menu.add_node_type(layout, "GeometryNodeSubdivideCurve")
node_add_menu.add_node_type(layout, "GeometryNodeTrimCurve")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Curve/Operations")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE"
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
bl_label = "Primitives"
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
def draw(self, _context):
layout = self.layout
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeCurveArc")
node_add_menu.add_node_type(layout, "GeometryNodeCurvePrimitiveBezierSegment")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeCurvePrimitiveCircle")
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeCurvePrimitiveLine")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeCurveSpiral")
node_add_menu.add_node_type(layout, "GeometryNodeCurveQuadraticBezier")
node_add_menu.add_node_type(layout, "GeometryNodeCurvePrimitiveQuadrilateral")
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeCurveStar")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Curve/Primitives")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Geometry Nodes: Curve and mesh topology access nodes This patch contains an initial set of nodes to access basic mesh topology information, as explored in T100020. The nodes allow six direct topology mappings for meshes: - **Corner -> Face** The face a corner is in, the index in the face - **Vertex -> Edge** Choose an edge attached to the vertex - **Vertex -> Corner** Choose a corner attached to the vertex - **Corner -> Edge** The next and previous edge at each face corner - **Corner -> Vertex** The vertex associated with a corner - **Corner -> Corner** Offset a corner index within a face And two new topology mappings for curves: - **Curve -> Points** Choose a point within a curve - **Point -> Curve** The curve a point is in, the index in the curve The idea is that some of the 16 possible mesh mappings are more important, and that this is a useful set of nodes to start exploring this area. For mappings with an arbitrary number of connections, we must sort them and use an index to choose a single element, because geometry nodes does not support list fields. Note that the sort index has repeating behavior as it goes over the "Total" number of connections, and negative sort indices choose from the end. Currently which of the "start" elements is used is determined by the field context, so the "Field at Index" and "Interpolate Domain" nodes will be quite important. Also, currently the "Sort Index" inputs are clamped to the number of connections. One important feature that isn't implemented here is using the winding order for the output elements. This can be a separate mode for some of these nodes. It will be optional because of the performance impact. There are several todos for separate commits after this: - Rename "Control Point Neighbors" to be consistent with this naming - Version away the "Vertex Neighbors" node which is fully redundant now - Implement a special case for when no weights are used for performance - De-duplicating some of the sorting logic between the nodes - Improve performance and memory use of topology mappings - Look into caching some of the mappings on meshes Differential Revision: https://developer.blender.org/D16029
2022-09-28 14:38:27 -05:00
class NODE_MT_geometry_node_curve_topology(Menu):
bl_idname = "NODE_MT_geometry_node_curve_topology"
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
bl_label = "Topology"
Geometry Nodes: Curve and mesh topology access nodes This patch contains an initial set of nodes to access basic mesh topology information, as explored in T100020. The nodes allow six direct topology mappings for meshes: - **Corner -> Face** The face a corner is in, the index in the face - **Vertex -> Edge** Choose an edge attached to the vertex - **Vertex -> Corner** Choose a corner attached to the vertex - **Corner -> Edge** The next and previous edge at each face corner - **Corner -> Vertex** The vertex associated with a corner - **Corner -> Corner** Offset a corner index within a face And two new topology mappings for curves: - **Curve -> Points** Choose a point within a curve - **Point -> Curve** The curve a point is in, the index in the curve The idea is that some of the 16 possible mesh mappings are more important, and that this is a useful set of nodes to start exploring this area. For mappings with an arbitrary number of connections, we must sort them and use an index to choose a single element, because geometry nodes does not support list fields. Note that the sort index has repeating behavior as it goes over the "Total" number of connections, and negative sort indices choose from the end. Currently which of the "start" elements is used is determined by the field context, so the "Field at Index" and "Interpolate Domain" nodes will be quite important. Also, currently the "Sort Index" inputs are clamped to the number of connections. One important feature that isn't implemented here is using the winding order for the output elements. This can be a separate mode for some of these nodes. It will be optional because of the performance impact. There are several todos for separate commits after this: - Rename "Control Point Neighbors" to be consistent with this naming - Version away the "Vertex Neighbors" node which is fully redundant now - Implement a special case for when no weights are used for performance - De-duplicating some of the sorting logic between the nodes - Improve performance and memory use of topology mappings - Look into caching some of the mappings on meshes Differential Revision: https://developer.blender.org/D16029
2022-09-28 14:38:27 -05:00
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeCurveOfPoint")
Geometry Nodes: Sort Add menu entries * In Input → Scene, move: * `Scene Time` above `Self Object` * In Geometry, move: * `Geometry to Instance` above `Join Geometry` * In Curve → Topology, move: * `Curve of Point` above `Offset Pint in Curve` * In Mesh → Read, move: * `Face Group Boundaries` above `Face Neighbors` * `Edges to Face Groups` above `Edge Vertices`
2023-08-24 16:09:58 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeOffsetPointInCurve")
Geometry Nodes: Curve and mesh topology access nodes This patch contains an initial set of nodes to access basic mesh topology information, as explored in T100020. The nodes allow six direct topology mappings for meshes: - **Corner -> Face** The face a corner is in, the index in the face - **Vertex -> Edge** Choose an edge attached to the vertex - **Vertex -> Corner** Choose a corner attached to the vertex - **Corner -> Edge** The next and previous edge at each face corner - **Corner -> Vertex** The vertex associated with a corner - **Corner -> Corner** Offset a corner index within a face And two new topology mappings for curves: - **Curve -> Points** Choose a point within a curve - **Point -> Curve** The curve a point is in, the index in the curve The idea is that some of the 16 possible mesh mappings are more important, and that this is a useful set of nodes to start exploring this area. For mappings with an arbitrary number of connections, we must sort them and use an index to choose a single element, because geometry nodes does not support list fields. Note that the sort index has repeating behavior as it goes over the "Total" number of connections, and negative sort indices choose from the end. Currently which of the "start" elements is used is determined by the field context, so the "Field at Index" and "Interpolate Domain" nodes will be quite important. Also, currently the "Sort Index" inputs are clamped to the number of connections. One important feature that isn't implemented here is using the winding order for the output elements. This can be a separate mode for some of these nodes. It will be optional because of the performance impact. There are several todos for separate commits after this: - Rename "Control Point Neighbors" to be consistent with this naming - Version away the "Vertex Neighbors" node which is fully redundant now - Implement a special case for when no weights are used for performance - De-duplicating some of the sorting logic between the nodes - Improve performance and memory use of topology mappings - Look into caching some of the mappings on meshes Differential Revision: https://developer.blender.org/D16029
2022-09-28 14:38:27 -05:00
node_add_menu.add_node_type(layout, "GeometryNodePointsOfCurve")
Cleanup: Make format
2023-09-26 17:05:36 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Curve/Topology")
Geometry Nodes: Curve and mesh topology access nodes This patch contains an initial set of nodes to access basic mesh topology information, as explored in T100020. The nodes allow six direct topology mappings for meshes: - **Corner -> Face** The face a corner is in, the index in the face - **Vertex -> Edge** Choose an edge attached to the vertex - **Vertex -> Corner** Choose a corner attached to the vertex - **Corner -> Edge** The next and previous edge at each face corner - **Corner -> Vertex** The vertex associated with a corner - **Corner -> Corner** Offset a corner index within a face And two new topology mappings for curves: - **Curve -> Points** Choose a point within a curve - **Point -> Curve** The curve a point is in, the index in the curve The idea is that some of the 16 possible mesh mappings are more important, and that this is a useful set of nodes to start exploring this area. For mappings with an arbitrary number of connections, we must sort them and use an index to choose a single element, because geometry nodes does not support list fields. Note that the sort index has repeating behavior as it goes over the "Total" number of connections, and negative sort indices choose from the end. Currently which of the "start" elements is used is determined by the field context, so the "Field at Index" and "Interpolate Domain" nodes will be quite important. Also, currently the "Sort Index" inputs are clamped to the number of connections. One important feature that isn't implemented here is using the winding order for the output elements. This can be a separate mode for some of these nodes. It will be optional because of the performance impact. There are several todos for separate commits after this: - Rename "Control Point Neighbors" to be consistent with this naming - Version away the "Vertex Neighbors" node which is fully redundant now - Implement a special case for when no weights are used for performance - De-duplicating some of the sorting logic between the nodes - Improve performance and memory use of topology mappings - Look into caching some of the mappings on meshes Differential Revision: https://developer.blender.org/D16029
2022-09-28 14:38:27 -05:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_geometry_node_GEO_GEOMETRY(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY"
bl_label = "Geometry"
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
def draw(self, _context):
layout = self.layout
layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_READ")
Geometry Nodes: Tweak menu location of sample nodes There was an inconsistency between geometry sample nodes and mesh/curve sample nodes, where the latter didn't have a special "Sample" category, and we categorized as "Operations", which they were not. Also put the sample category between "Read" and "Write" since the verb name is more consistent and sampling is an advanced form of reading.
2023-02-03 16:26:30 -05:00
layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_SAMPLE")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_WRITE")
User Inteface: Missing separator in Geometry Nodes > Add Node > Geometry menu This separator was missing in the original change in the menus (d4e638baac4).
2023-01-16 12:23:50 +01:00
layout.separator()
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_OPERATIONS")
layout.separator()
node_add_menu.add_node_type(layout, "GeometryNodeGeometryToInstance")
Geometry Nodes: Sort Add menu entries * In Input → Scene, move: * `Scene Time` above `Self Object` * In Geometry, move: * `Geometry to Instance` above `Join Geometry` * In Curve → Topology, move: * `Curve of Point` above `Offset Pint in Curve` * In Mesh → Read, move: * `Face Group Boundaries` above `Face Neighbors` * `Edges to Face Groups` above `Edge Vertices`
2023-08-24 16:09:58 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeJoinGeometry")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
Cleanup: make format
2023-01-16 14:39:10 +01:00
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_geometry_node_GEO_GEOMETRY_READ(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY_READ"
bl_label = "Read"
Geometry Nodes: Move tool-specific nodes to proper menus Instead of putting all the tool specific nodes (inputs, operations, etc) in a single menu, use the existing categories. This is similar to how the shader editor shows nodes depending on which render engine is enabled. It's also more scalable for when more tool-specific nodes are added. --- I discussed this with Pablo on Tuesday-- it came up when we talked about the organization of the compositor add menu. Pull Request: https://projects.blender.org/blender/blender/pulls/111449
2023-08-24 13:34:15 +02:00
def draw(self, context):
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeInputID")
node_add_menu.add_node_type(layout, "GeometryNodeInputIndex")
node_add_menu.add_node_type(layout, "GeometryNodeInputNamedAttribute")
node_add_menu.add_node_type(layout, "GeometryNodeInputNormal")
node_add_menu.add_node_type(layout, "GeometryNodeInputPosition")
node_add_menu.add_node_type(layout, "GeometryNodeInputRadius")
Geometry Nodes: Move tool-specific nodes to proper menus Instead of putting all the tool specific nodes (inputs, operations, etc) in a single menu, use the existing categories. This is similar to how the shader editor shows nodes depending on which render engine is enabled. It's also more scalable for when more tool-specific nodes are added. --- I discussed this with Pablo on Tuesday-- it came up when we talked about the organization of the compositor add menu. Pull Request: https://projects.blender.org/blender/blender/pulls/111449
2023-08-24 13:34:15 +02:00
if context.space_data.geometry_nodes_type == 'TOOL':
node_add_menu.add_node_type(layout, "GeometryNodeToolSelection")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Geometry/Read")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_geometry_node_GEO_GEOMETRY_WRITE(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY_WRITE"
bl_label = "Write"
Geometry Nodes: Move tool-specific nodes to proper menus Instead of putting all the tool specific nodes (inputs, operations, etc) in a single menu, use the existing categories. This is similar to how the shader editor shows nodes depending on which render engine is enabled. It's also more scalable for when more tool-specific nodes are added. --- I discussed this with Pablo on Tuesday-- it came up when we talked about the organization of the compositor add menu. Pull Request: https://projects.blender.org/blender/blender/pulls/111449
2023-08-24 13:34:15 +02:00
def draw(self, context):
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeSetID")
node_add_menu.add_node_type(layout, "GeometryNodeSetPosition")
Geometry Nodes: Move tool-specific nodes to proper menus Instead of putting all the tool specific nodes (inputs, operations, etc) in a single menu, use the existing categories. This is similar to how the shader editor shows nodes depending on which render engine is enabled. It's also more scalable for when more tool-specific nodes are added. --- I discussed this with Pablo on Tuesday-- it came up when we talked about the organization of the compositor add menu. Pull Request: https://projects.blender.org/blender/blender/pulls/111449
2023-08-24 13:34:15 +02:00
if context.space_data.geometry_nodes_type == 'TOOL':
node_add_menu.add_node_type(layout, "GeometryNodeToolSetSelection")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Geometry/Write")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
Cleanup: make format
2023-01-16 14:39:10 +01:00
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_geometry_node_GEO_GEOMETRY_OPERATIONS(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY_OPERATIONS"
bl_label = "Operations"
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeBoundBox")
node_add_menu.add_node_type(layout, "GeometryNodeConvexHull")
node_add_menu.add_node_type(layout, "GeometryNodeDeleteGeometry")
node_add_menu.add_node_type(layout, "GeometryNodeDuplicateElements")
node_add_menu.add_node_type(layout, "GeometryNodeMergeByDistance")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeTransform")
layout.separator()
node_add_menu.add_node_type(layout, "GeometryNodeSeparateComponents")
node_add_menu.add_node_type(layout, "GeometryNodeSeparateGeometry")
Geometry Nodes: new Split to Instances node This node allows splitting up a geometry into groups. A group is defined as all elements with the same group id. The output contains an instance per group. The `Group ID` output can be used for further deterministic processing. The node supports meshes, curves, point clouds and instances. It only works on the top-level geometry, so it does not go into nested instances because it also generates new instances. Co-authored-by: Hans Goudey <hans@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/113083
2023-10-18 10:26:23 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeSplitToInstances")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Geometry/Operations")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
Cleanup: make format
2023-01-16 14:39:10 +01:00
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_geometry_node_GEO_GEOMETRY_SAMPLE(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY_SAMPLE"
bl_label = "Sample"
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeProximity")
Geometry Nodes: new Index of Nearest node The node outputs the index of the closest element to itself. See #102387 for the original design. This is different from the Sample Nearest node in two important ways: * It does not have a geometry input, instead the geometry is taken from the field evaluation context. * The node can exclude the "current" element from the search. * The group id input can be used to build subsets of elements that only consider each other as neighbors and ignore elements with other ids. Pull Request: https://projects.blender.org/blender/blender/pulls/104619
2023-04-22 13:11:51 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeIndexOfNearest")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeRaycast")
node_add_menu.add_node_type(layout, "GeometryNodeSampleIndex")
node_add_menu.add_node_type(layout, "GeometryNodeSampleNearest")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Geometry/Sample")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_geometry_node_GEO_INPUT(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_INPUT"
bl_label = "Input"
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
def draw(self, _context):
layout = self.layout
layout.menu("NODE_MT_geometry_node_GEO_INPUT_CONSTANT")
layout.menu("NODE_MT_geometry_node_GEO_INPUT_GROUP")
layout.menu("NODE_MT_geometry_node_GEO_INPUT_SCENE")
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
class NODE_MT_geometry_node_GEO_INPUT_CONSTANT(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_INPUT_CONSTANT"
bl_label = "Constant"
I18n: disambiguate messages - "Lines" in the sense of number of lines - "Number" can mean "amount, count" or "index, offset" - "Second" can be an ordinal number or a unit - "Root": add the brush curve to the "square root falloff" sense - "Strip" can be a sequence or a type of hair rendering - "Constant" in the sense of a value, for the Geometry Nodes add submenu (#105447). Additionally, extract: - "Press a key" from the Keymap preferences. - "MaskLayer", upon new mask layer creation Ref #43295, #105447
2023-03-03 14:44:21 +01:00
bl_translation_context = i18n_contexts.id_nodetree
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "FunctionNodeInputBool")
node_add_menu.add_node_type(layout, "FunctionNodeInputColor")
Geometry Nodes: Image Input Node Add a simple node to choose an image data-block. Ref T102854 Differential Revision: https://developer.blender.org/D16644
2022-12-09 15:50:00 -06:00
node_add_menu.add_node_type(layout, "GeometryNodeInputImage")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "FunctionNodeInputInt")
node_add_menu.add_node_type(layout, "GeometryNodeInputMaterial")
node_add_menu.add_node_type(layout, "FunctionNodeInputString")
node_add_menu.add_node_type(layout, "ShaderNodeValue")
node_add_menu.add_node_type(layout, "FunctionNodeInputVector")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Input/Constant")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_geometry_node_GEO_INPUT_GROUP(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_INPUT_GROUP"
bl_label = "Group"
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "NodeGroupInput")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Input/Group")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_geometry_node_GEO_INPUT_SCENE(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_INPUT_SCENE"
bl_label = "Scene"
Geometry Nodes: Move tool-specific nodes to proper menus Instead of putting all the tool specific nodes (inputs, operations, etc) in a single menu, use the existing categories. This is similar to how the shader editor shows nodes depending on which render engine is enabled. It's also more scalable for when more tool-specific nodes are added. --- I discussed this with Pablo on Tuesday-- it came up when we talked about the organization of the compositor add menu. Pull Request: https://projects.blender.org/blender/blender/pulls/111449
2023-08-24 13:34:15 +02:00
def draw(self, context):
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout = self.layout
Geometry Nodes: Move tool-specific nodes to proper menus Instead of putting all the tool specific nodes (inputs, operations, etc) in a single menu, use the existing categories. This is similar to how the shader editor shows nodes depending on which render engine is enabled. It's also more scalable for when more tool-specific nodes are added. --- I discussed this with Pablo on Tuesday-- it came up when we talked about the organization of the compositor add menu. Pull Request: https://projects.blender.org/blender/blender/pulls/111449
2023-08-24 13:34:15 +02:00
if context.space_data.geometry_nodes_type == 'TOOL':
node_add_menu.add_node_type(layout, "GeometryNodeTool3DCursor")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeCollectionInfo")
node_add_menu.add_node_type(layout, "GeometryNodeImageInfo")
node_add_menu.add_node_type(layout, "GeometryNodeIsViewport")
node_add_menu.add_node_type(layout, "GeometryNodeObjectInfo")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeInputSceneTime")
Geometry Nodes: Sort Add menu entries * In Input → Scene, move: * `Scene Time` above `Self Object` * In Geometry, move: * `Geometry to Instance` above `Join Geometry` * In Curve → Topology, move: * `Curve of Point` above `Offset Pint in Curve` * In Mesh → Read, move: * `Face Group Boundaries` above `Face Neighbors` * `Edges to Face Groups` above `Edge Vertices`
2023-08-24 16:09:58 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeSelfObject")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Input/Scene")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_geometry_node_GEO_INSTANCE(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_INSTANCE"
bl_label = "Instances"
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeInstanceOnPoints")
node_add_menu.add_node_type(layout, "GeometryNodeInstancesToPoints")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.separator()
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeRealizeInstances")
node_add_menu.add_node_type(layout, "GeometryNodeRotateInstances")
node_add_menu.add_node_type(layout, "GeometryNodeScaleInstances")
node_add_menu.add_node_type(layout, "GeometryNodeTranslateInstances")
layout.separator()
node_add_menu.add_node_type(layout, "GeometryNodeInputInstanceRotation")
node_add_menu.add_node_type(layout, "GeometryNodeInputInstanceScale")
Nodes: Add node group assets in add menu This patch builds on the work from bdb57541475f to add node group assets directly in the node editor add menu. Assets are added after separators to distinguish them, but otherwise they look like any other node. The catalog trees from all configured libraries are used to build the menu hierarchy. Only catalogs with matching asset types are used though. There are a few limitations of this initial version. For now this only supports geometry nodes. Support for other built-in node systems just requires some refactoring of the corresponding add menu though. Lazy loading will be added in a followup commit. For now there is a label the first time the menu is opened. Like the search menu integration, re-saving asset library files in 3.4 is required, if it hasn't been done already. Implementation wise, there is a some ugly code here. A lot of that is because the asset system isn't complete. The RNA API doesn't work well yet, and the system isn't built to interact with multiple libraries at once. It's also ugly because of the way we combine automatic menu generation with builtin menus. As noted in a code comment, these two systems could be merged completely so that the menus for builtin nodes are also generated in the same way. Differential Revision: https://developer.blender.org/D16135
2022-11-01 16:09:49 +01:00
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_geometry_node_GEO_MATERIAL(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_MATERIAL"
bl_label = "Material"
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeReplaceMaterial")
layout.separator()
node_add_menu.add_node_type(layout, "GeometryNodeInputMaterialIndex")
node_add_menu.add_node_type(layout, "GeometryNodeMaterialSelection")
layout.separator()
node_add_menu.add_node_type(layout, "GeometryNodeSetMaterial")
node_add_menu.add_node_type(layout, "GeometryNodeSetMaterialIndex")
Nodes: Add node group assets in add menu This patch builds on the work from bdb57541475f to add node group assets directly in the node editor add menu. Assets are added after separators to distinguish them, but otherwise they look like any other node. The catalog trees from all configured libraries are used to build the menu hierarchy. Only catalogs with matching asset types are used though. There are a few limitations of this initial version. For now this only supports geometry nodes. Support for other built-in node systems just requires some refactoring of the corresponding add menu though. Lazy loading will be added in a followup commit. For now there is a label the first time the menu is opened. Like the search menu integration, re-saving asset library files in 3.4 is required, if it hasn't been done already. Implementation wise, there is a some ugly code here. A lot of that is because the asset system isn't complete. The RNA API doesn't work well yet, and the system isn't built to interact with multiple libraries at once. It's also ugly because of the way we combine automatic menu generation with builtin menus. As noted in a code comment, these two systems could be merged completely so that the menus for builtin nodes are also generated in the same way. Differential Revision: https://developer.blender.org/D16135
2022-11-01 16:09:49 +01:00
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_geometry_node_GEO_MESH(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_MESH"
bl_label = "Mesh"
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
def draw(self, _context):
layout = self.layout
layout.menu("NODE_MT_geometry_node_GEO_MESH_READ")
Geometry Nodes: Tweak menu location of sample nodes There was an inconsistency between geometry sample nodes and mesh/curve sample nodes, where the latter didn't have a special "Sample" category, and we categorized as "Operations", which they were not. Also put the sample category between "Read" and "Write" since the verb name is more consistent and sampling is an advanced form of reading.
2023-02-03 16:26:30 -05:00
layout.menu("NODE_MT_geometry_node_GEO_MESH_SAMPLE")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.menu("NODE_MT_geometry_node_GEO_MESH_WRITE")
layout.separator()
layout.menu("NODE_MT_geometry_node_GEO_MESH_OPERATIONS")
layout.menu("NODE_MT_category_PRIMITIVES_MESH")
layout.menu("NODE_MT_geometry_node_mesh_topology")
layout.menu("NODE_MT_category_GEO_UV")
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
class NODE_MT_geometry_node_GEO_MESH_READ(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_MESH_READ"
bl_label = "Read"
Geometry Nodes: Move tool-specific nodes to proper menus Instead of putting all the tool specific nodes (inputs, operations, etc) in a single menu, use the existing categories. This is similar to how the shader editor shows nodes depending on which render engine is enabled. It's also more scalable for when more tool-specific nodes are added. --- I discussed this with Pablo on Tuesday-- it came up when we talked about the organization of the compositor add menu. Pull Request: https://projects.blender.org/blender/blender/pulls/111449
2023-08-24 13:34:15 +02:00
def draw(self, context):
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshEdgeAngle")
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshEdgeNeighbors")
Geometry Nodes: Sort Add menu entries * In Input → Scene, move: * `Scene Time` above `Self Object` * In Geometry, move: * `Geometry to Instance` above `Join Geometry` * In Curve → Topology, move: * `Curve of Point` above `Offset Pint in Curve` * In Mesh → Read, move: * `Face Group Boundaries` above `Face Neighbors` * `Edges to Face Groups` above `Edge Vertices`
2023-08-24 16:09:58 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshEdgeVertices")
Fix: wrong sorting in Add menu in recent commit `Edges to Face Groups` comes after `Edge Vertices`, didn't notice it was plural. Thanks Dalai for pointing it out.
2023-08-24 16:15:43 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeEdgesToFaceGroups")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshFaceArea")
node_add_menu.add_node_type(layout, "GeometryNodeMeshFaceSetBoundaries")
Geometry Nodes: Sort Add menu entries * In Input → Scene, move: * `Scene Time` above `Self Object` * In Geometry, move: * `Geometry to Instance` above `Join Geometry` * In Curve → Topology, move: * `Curve of Point` above `Offset Pint in Curve` * In Mesh → Read, move: * `Face Group Boundaries` above `Face Neighbors` * `Edges to Face Groups` above `Edge Vertices`
2023-08-24 16:09:58 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshFaceNeighbors")
Geometry Nodes: Move tool-specific nodes to proper menus Instead of putting all the tool specific nodes (inputs, operations, etc) in a single menu, use the existing categories. This is similar to how the shader editor shows nodes depending on which render engine is enabled. It's also more scalable for when more tool-specific nodes are added. --- I discussed this with Pablo on Tuesday-- it came up when we talked about the organization of the compositor add menu. Pull Request: https://projects.blender.org/blender/blender/pulls/111449
2023-08-24 13:34:15 +02:00
if context.space_data.geometry_nodes_type == 'TOOL':
node_add_menu.add_node_type(layout, "GeometryNodeToolFaceSet")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshFaceIsPlanar")
node_add_menu.add_node_type(layout, "GeometryNodeInputShadeSmooth")
Geometry Nodes: Expose sharp edge status with builtin nodes Change the existing "Is Shade Smooth" node to be named "Is Face Smooth" and add a new "Is Edge Smooth" node. Also give the "Set Shade Smooth" node the ability to set face or edge smoothness. The fact that the nodes process "smooth" data reversed from the builtin "sharp" attributes can be reversed with versioning in a separate commit. While it's tempting to abstract the sharpness status into a single node, face and edge smoothness are accessed separately in edit mode, and the subtlety of interacting with data on different domains would make that confusing. Instead, a separate "Is Shade Smooth" node group asset will give all the sharp elements taking into account both builtin attributes. The fact that sharpness is stored separately on two domains makes the best design for simple operations non-obvious. For example, you should be able to remove all sharpness or make everything flat with a single node. The behavior depends on whether the two attributes exist and the combination of values between the domains. --- ![image](/attachments/c3f053c4-2b0f-44ac-9227-62071065fe56) ![image](/attachments/fd489fb3-314b-42ff-a5a9-e79578cbdfe7) Pull Request: https://projects.blender.org/blender/blender/pulls/112029
2023-09-06 17:12:27 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeInputEdgeSmooth")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshIsland")
node_add_menu.add_node_type(layout, "GeometryNodeInputShortestEdgePaths")
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshVertexNeighbors")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Mesh/Read")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
Geometry Nodes: Tweak menu location of sample nodes There was an inconsistency between geometry sample nodes and mesh/curve sample nodes, where the latter didn't have a special "Sample" category, and we categorized as "Operations", which they were not. Also put the sample category between "Read" and "Write" since the verb name is more consistent and sampling is an advanced form of reading.
2023-02-03 16:26:30 -05:00
class NODE_MT_geometry_node_GEO_MESH_SAMPLE(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_MESH_SAMPLE"
bl_label = "Sample"
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeSampleNearestSurface")
node_add_menu.add_node_type(layout, "GeometryNodeSampleUVSurface")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Mesh/Sample")
Geometry Nodes: Tweak menu location of sample nodes There was an inconsistency between geometry sample nodes and mesh/curve sample nodes, where the latter didn't have a special "Sample" category, and we categorized as "Operations", which they were not. Also put the sample category between "Read" and "Write" since the verb name is more consistent and sampling is an advanced form of reading.
2023-02-03 16:26:30 -05:00
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_geometry_node_GEO_MESH_WRITE(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_MESH_WRITE"
bl_label = "Write"
Geometry Nodes: Move tool-specific nodes to proper menus Instead of putting all the tool specific nodes (inputs, operations, etc) in a single menu, use the existing categories. This is similar to how the shader editor shows nodes depending on which render engine is enabled. It's also more scalable for when more tool-specific nodes are added. --- I discussed this with Pablo on Tuesday-- it came up when we talked about the organization of the compositor add menu. Pull Request: https://projects.blender.org/blender/blender/pulls/111449
2023-08-24 13:34:15 +02:00
def draw(self, context):
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeSetShadeSmooth")
Geometry Nodes: Move tool-specific nodes to proper menus Instead of putting all the tool specific nodes (inputs, operations, etc) in a single menu, use the existing categories. This is similar to how the shader editor shows nodes depending on which render engine is enabled. It's also more scalable for when more tool-specific nodes are added. --- I discussed this with Pablo on Tuesday-- it came up when we talked about the organization of the compositor add menu. Pull Request: https://projects.blender.org/blender/blender/pulls/111449
2023-08-24 13:34:15 +02:00
if context.space_data.geometry_nodes_type == 'TOOL':
node_add_menu.add_node_type(layout, "GeometryNodeToolSetFaceSet")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Mesh/Write")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_geometry_node_GEO_MESH_OPERATIONS(Menu):
bl_idname = "NODE_MT_geometry_node_GEO_MESH_OPERATIONS"
bl_label = "Operations"
Cleanup: remove unused argument signified from used arguments in Python Also simplify import for `_bpy._utils_previews`.
2023-03-23 15:31:14 +11:00
def draw(self, context):
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeDualMesh")
node_add_menu.add_node_type(layout, "GeometryNodeEdgePathsToCurves")
node_add_menu.add_node_type(layout, "GeometryNodeEdgePathsToSelection")
node_add_menu.add_node_type(layout, "GeometryNodeExtrudeMesh")
node_add_menu.add_node_type(layout, "GeometryNodeFlipFaces")
node_add_menu.add_node_type(layout, "GeometryNodeMeshBoolean")
node_add_menu.add_node_type(layout, "GeometryNodeMeshToCurve")
node_add_menu.add_node_type(layout, "GeometryNodeMeshToPoints")
Cleanup: remove unused argument signified from used arguments in Python Also simplify import for `_bpy._utils_previews`.
2023-03-23 15:31:14 +11:00
if context.preferences.experimental.use_new_volume_nodes:
Nodes: SDF Volume nodes milestone 1 Geometry Nodes: SDF Volume nodes milestone 1 Adds initial support for SDF volume creation and manipulation. `SDF volume` is Blender's name of an OpenVDB grid of type Level Set. See the discussion about naming in #91668. The new nodes are: - Mesh to SDF Volume: Converts a mesh to an SDF Volume - Points to SDF Volume: Converts points to an SDF Volume - Mean Filter SDF Volume: Applies a Mean Filter to an SDF - Offset SDF Volume: Applies an offset to an SDF - SDF Volume Sphere: Creates an SDF Volume in the shape of a sphere For now an experimental option `New Volume Nodes` needs to be enabled in Blender preferences for the nodes to be visible. See the current work plan for Volume Nodes in #103248. Pull Request: https://projects.blender.org/blender/blender/pulls/105090
2023-03-19 11:21:08 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeMeshToSDFVolume")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeMeshToVolume")
node_add_menu.add_node_type(layout, "GeometryNodeScaleElements")
node_add_menu.add_node_type(layout, "GeometryNodeSplitEdges")
node_add_menu.add_node_type(layout, "GeometryNodeSubdivideMesh")
node_add_menu.add_node_type(layout, "GeometryNodeSubdivisionSurface")
node_add_menu.add_node_type(layout, "GeometryNodeTriangulate")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Mesh/Operations")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_category_PRIMITIVES_MESH(Menu):
bl_idname = "NODE_MT_category_PRIMITIVES_MESH"
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
bl_label = "Primitives"
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeMeshCone")
node_add_menu.add_node_type(layout, "GeometryNodeMeshCube")
node_add_menu.add_node_type(layout, "GeometryNodeMeshCylinder")
node_add_menu.add_node_type(layout, "GeometryNodeMeshGrid")
node_add_menu.add_node_type(layout, "GeometryNodeMeshIcoSphere")
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeMeshCircle")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeMeshLine")
Fix T101610: UV Sphere missing from geometry nodes menu Caused by 837144b4577f161baf1625f8a5478c83a088ea0f
2022-10-05 10:53:12 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeMeshUVSphere")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Mesh/Primitives")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Geometry Nodes: Curve and mesh topology access nodes This patch contains an initial set of nodes to access basic mesh topology information, as explored in T100020. The nodes allow six direct topology mappings for meshes: - **Corner -> Face** The face a corner is in, the index in the face - **Vertex -> Edge** Choose an edge attached to the vertex - **Vertex -> Corner** Choose a corner attached to the vertex - **Corner -> Edge** The next and previous edge at each face corner - **Corner -> Vertex** The vertex associated with a corner - **Corner -> Corner** Offset a corner index within a face And two new topology mappings for curves: - **Curve -> Points** Choose a point within a curve - **Point -> Curve** The curve a point is in, the index in the curve The idea is that some of the 16 possible mesh mappings are more important, and that this is a useful set of nodes to start exploring this area. For mappings with an arbitrary number of connections, we must sort them and use an index to choose a single element, because geometry nodes does not support list fields. Note that the sort index has repeating behavior as it goes over the "Total" number of connections, and negative sort indices choose from the end. Currently which of the "start" elements is used is determined by the field context, so the "Field at Index" and "Interpolate Domain" nodes will be quite important. Also, currently the "Sort Index" inputs are clamped to the number of connections. One important feature that isn't implemented here is using the winding order for the output elements. This can be a separate mode for some of these nodes. It will be optional because of the performance impact. There are several todos for separate commits after this: - Rename "Control Point Neighbors" to be consistent with this naming - Version away the "Vertex Neighbors" node which is fully redundant now - Implement a special case for when no weights are used for performance - De-duplicating some of the sorting logic between the nodes - Improve performance and memory use of topology mappings - Look into caching some of the mappings on meshes Differential Revision: https://developer.blender.org/D16029
2022-09-28 14:38:27 -05:00
class NODE_MT_geometry_node_mesh_topology(Menu):
bl_idname = "NODE_MT_geometry_node_mesh_topology"
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
bl_label = "Topology"
Geometry Nodes: Curve and mesh topology access nodes This patch contains an initial set of nodes to access basic mesh topology information, as explored in T100020. The nodes allow six direct topology mappings for meshes: - **Corner -> Face** The face a corner is in, the index in the face - **Vertex -> Edge** Choose an edge attached to the vertex - **Vertex -> Corner** Choose a corner attached to the vertex - **Corner -> Edge** The next and previous edge at each face corner - **Corner -> Vertex** The vertex associated with a corner - **Corner -> Corner** Offset a corner index within a face And two new topology mappings for curves: - **Curve -> Points** Choose a point within a curve - **Point -> Curve** The curve a point is in, the index in the curve The idea is that some of the 16 possible mesh mappings are more important, and that this is a useful set of nodes to start exploring this area. For mappings with an arbitrary number of connections, we must sort them and use an index to choose a single element, because geometry nodes does not support list fields. Note that the sort index has repeating behavior as it goes over the "Total" number of connections, and negative sort indices choose from the end. Currently which of the "start" elements is used is determined by the field context, so the "Field at Index" and "Interpolate Domain" nodes will be quite important. Also, currently the "Sort Index" inputs are clamped to the number of connections. One important feature that isn't implemented here is using the winding order for the output elements. This can be a separate mode for some of these nodes. It will be optional because of the performance impact. There are several todos for separate commits after this: - Rename "Control Point Neighbors" to be consistent with this naming - Version away the "Vertex Neighbors" node which is fully redundant now - Implement a special case for when no weights are used for performance - De-duplicating some of the sorting logic between the nodes - Improve performance and memory use of topology mappings - Look into caching some of the mappings on meshes Differential Revision: https://developer.blender.org/D16029
2022-09-28 14:38:27 -05:00
def draw(self, _context):
layout = self.layout
Geometry Nodes: Add Corners of Edge node Adds the "Corners of Edge" topology node to geometry nodes. Combining this node with the "Face of Corner" node allows getting informations about the faces connected to an edge. The behavior is slightly non-obvious-- the node only gives the corner neighbors that come *before* the current edge in directly neighboring faces. This allows the operation to be easily reversed and reduces redundancy between nodes. See the devtalk thread: https://devtalk.blender.org/t/29379 Pull Request: https://projects.blender.org/blender/blender/pulls/107968
2023-05-31 15:25:48 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeCornersOfEdge")
Cleanup: quiet various pylint warnings
2023-04-13 13:14:05 +10:00
node_add_menu.add_node_type(layout, "GeometryNodeCornersOfFace")
node_add_menu.add_node_type(layout, "GeometryNodeCornersOfVertex")
node_add_menu.add_node_type(layout, "GeometryNodeEdgesOfCorner")
node_add_menu.add_node_type(layout, "GeometryNodeEdgesOfVertex")
node_add_menu.add_node_type(layout, "GeometryNodeFaceOfCorner")
node_add_menu.add_node_type(layout, "GeometryNodeOffsetCornerInFace")
node_add_menu.add_node_type(layout, "GeometryNodeVertexOfCorner")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Mesh/Topology")
Geometry Nodes: Curve and mesh topology access nodes This patch contains an initial set of nodes to access basic mesh topology information, as explored in T100020. The nodes allow six direct topology mappings for meshes: - **Corner -> Face** The face a corner is in, the index in the face - **Vertex -> Edge** Choose an edge attached to the vertex - **Vertex -> Corner** Choose a corner attached to the vertex - **Corner -> Edge** The next and previous edge at each face corner - **Corner -> Vertex** The vertex associated with a corner - **Corner -> Corner** Offset a corner index within a face And two new topology mappings for curves: - **Curve -> Points** Choose a point within a curve - **Point -> Curve** The curve a point is in, the index in the curve The idea is that some of the 16 possible mesh mappings are more important, and that this is a useful set of nodes to start exploring this area. For mappings with an arbitrary number of connections, we must sort them and use an index to choose a single element, because geometry nodes does not support list fields. Note that the sort index has repeating behavior as it goes over the "Total" number of connections, and negative sort indices choose from the end. Currently which of the "start" elements is used is determined by the field context, so the "Field at Index" and "Interpolate Domain" nodes will be quite important. Also, currently the "Sort Index" inputs are clamped to the number of connections. One important feature that isn't implemented here is using the winding order for the output elements. This can be a separate mode for some of these nodes. It will be optional because of the performance impact. There are several todos for separate commits after this: - Rename "Control Point Neighbors" to be consistent with this naming - Version away the "Vertex Neighbors" node which is fully redundant now - Implement a special case for when no weights are used for performance - De-duplicating some of the sorting logic between the nodes - Improve performance and memory use of topology mappings - Look into caching some of the mappings on meshes Differential Revision: https://developer.blender.org/D16029
2022-09-28 14:38:27 -05:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_category_GEO_OUTPUT(Menu):
bl_idname = "NODE_MT_category_GEO_OUTPUT"
bl_label = "Output"
def draw(self, _context):
layout = self.layout
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "NodeGroupOutput")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeViewer")
Nodes: Add node group assets in add menu This patch builds on the work from bdb57541475f to add node group assets directly in the node editor add menu. Assets are added after separators to distinguish them, but otherwise they look like any other node. The catalog trees from all configured libraries are used to build the menu hierarchy. Only catalogs with matching asset types are used though. There are a few limitations of this initial version. For now this only supports geometry nodes. Support for other built-in node systems just requires some refactoring of the corresponding add menu though. Lazy loading will be added in a followup commit. For now there is a label the first time the menu is opened. Like the search menu integration, re-saving asset library files in 3.4 is required, if it hasn't been done already. Implementation wise, there is a some ugly code here. A lot of that is because the asset system isn't complete. The RNA API doesn't work well yet, and the system isn't built to interact with multiple libraries at once. It's also ugly because of the way we combine automatic menu generation with builtin menus. As noted in a code comment, these two systems could be merged completely so that the menus for builtin nodes are also generated in the same way. Differential Revision: https://developer.blender.org/D16135
2022-11-01 16:09:49 +01:00
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_category_GEO_POINT(Menu):
bl_idname = "NODE_MT_category_GEO_POINT"
bl_label = "Point"
Cleanup: remove unused argument signified from used arguments in Python Also simplify import for `_bpy._utils_previews`.
2023-03-23 15:31:14 +11:00
def draw(self, context):
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeDistributePointsInVolume")
node_add_menu.add_node_type(layout, "GeometryNodeDistributePointsOnFaces")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.separator()
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodePoints")
Geometry Nodes: Points to Curves node New node to converts groups of points to curves. Groups of points defined as `Curve Group ID` attribute. `Weight` in curve is used for sort points in each group. Points of result curves propagate attributes from original points. Implicit conversion of other geometry types is not supported currently. Pull Request: https://projects.blender.org/blender/blender/pulls/109610
2023-08-29 16:52:20 +02:00
node_add_menu.add_node_type(layout, "GeometryNodePointsToCurves")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodePointsToVertices")
Cleanup: remove unused argument signified from used arguments in Python Also simplify import for `_bpy._utils_previews`.
2023-03-23 15:31:14 +11:00
if context.preferences.experimental.use_new_volume_nodes:
Nodes: SDF Volume nodes milestone 1 Geometry Nodes: SDF Volume nodes milestone 1 Adds initial support for SDF volume creation and manipulation. `SDF volume` is Blender's name of an OpenVDB grid of type Level Set. See the discussion about naming in #91668. The new nodes are: - Mesh to SDF Volume: Converts a mesh to an SDF Volume - Points to SDF Volume: Converts points to an SDF Volume - Mean Filter SDF Volume: Applies a Mean Filter to an SDF - Offset SDF Volume: Applies an offset to an SDF - SDF Volume Sphere: Creates an SDF Volume in the shape of a sphere For now an experimental option `New Volume Nodes` needs to be enabled in Blender preferences for the nodes to be visible. See the current work plan for Volume Nodes in #103248. Pull Request: https://projects.blender.org/blender/blender/pulls/105090
2023-03-19 11:21:08 +01:00
node_add_menu.add_node_type(layout, "GeometryNodePointsToSDFVolume")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodePointsToVolume")
layout.separator()
node_add_menu.add_node_type(layout, "GeometryNodeSetPointRadius")
Nodes: Add node group assets in add menu This patch builds on the work from bdb57541475f to add node group assets directly in the node editor add menu. Assets are added after separators to distinguish them, but otherwise they look like any other node. The catalog trees from all configured libraries are used to build the menu hierarchy. Only catalogs with matching asset types are used though. There are a few limitations of this initial version. For now this only supports geometry nodes. Support for other built-in node systems just requires some refactoring of the corresponding add menu though. Lazy loading will be added in a followup commit. For now there is a label the first time the menu is opened. Like the search menu integration, re-saving asset library files in 3.4 is required, if it hasn't been done already. Implementation wise, there is a some ugly code here. A lot of that is because the asset system isn't complete. The RNA API doesn't work well yet, and the system isn't built to interact with multiple libraries at once. It's also ugly because of the way we combine automatic menu generation with builtin menus. As noted in a code comment, these two systems could be merged completely so that the menus for builtin nodes are also generated in the same way. Differential Revision: https://developer.blender.org/D16135
2022-11-01 16:09:49 +01:00
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Geometry Nodes: add simulation support This adds support for building simulations with geometry nodes. A new `Simulation Input` and `Simulation Output` node allow maintaining a simulation state across multiple frames. Together these two nodes form a `simulation zone` which contains all the nodes that update the simulation state from one frame to the next. A new simulation zone can be added via the menu (`Simulation > Simulation Zone`) or with the node add search. The simulation state contains a geometry by default. However, it is possible to add multiple geometry sockets as well as other socket types. Currently, field inputs are evaluated and stored for the preceding geometry socket in the order that the sockets are shown. Simulation state items can be added by linking one of the empty sockets to something else. In the sidebar, there is a new panel that allows adding, removing and reordering these sockets. The simulation nodes behave as follows: * On the first frame, the inputs of the `Simulation Input` node are evaluated to initialize the simulation state. In later frames these sockets are not evaluated anymore. The `Delta Time` at the first frame is zero, but the simulation zone is still evaluated. * On every next frame, the `Simulation Input` node outputs the simulation state of the previous frame. Nodes in the simulation zone can edit that data in arbitrary ways, also taking into account the `Delta Time`. The new simulation state has to be passed to the `Simulation Output` node where it is cached and forwarded. * On a frame that is already cached or baked, the nodes in the simulation zone are not evaluated, because the `Simulation Output` node can return the previously cached data directly. It is not allowed to connect sockets from inside the simulation zone to the outside without going through the `Simulation Output` node. This is a necessary restriction to make caching and sub-frame interpolation work. Links can go into the simulation zone without problems though. Anonymous attributes are not propagated by the simulation nodes unless they are explicitly stored in the simulation state. This is unfortunate, but currently there is no practical and reliable alternative. The core problem is detecting which anonymous attributes will be required for the simulation and afterwards. While we can detect this for the current evaluation, we can't look into the future in time to see what data will be necessary. We intend to make it easier to explicitly pass data through a simulation in the future, even if the simulation is in a nested node group. There is a new `Simulation Nodes` panel in the physics tab in the properties editor. It allows baking all simulation zones on the selected objects. The baking options are intentially kept at a minimum for this MVP. More features for simulation baking as well as baking in general can be expected to be added separately. All baked data is stored on disk in a folder next to the .blend file. #106937 describes how baking is implemented in more detail. Volumes can not be baked yet and materials are lost during baking for now. Packing the baked data into the .blend file is not yet supported. The timeline indicates which frames are currently cached, baked or cached but invalidated by user-changes. Simulation input and output nodes are internally linked together by their `bNode.identifier` which stays the same even if the node name changes. They are generally added and removed together. However, there are still cases where "dangling" simulation nodes can be created currently. Those generally don't cause harm, but would be nice to avoid this in more cases in the future. Co-authored-by: Hans Goudey <h.goudey@me.com> Co-authored-by: Lukas Tönne <lukas@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/104924
2023-05-03 13:18:51 +02:00
class NODE_MT_category_simulation(Menu):
bl_idname = "NODE_MT_category_simulation"
bl_label = "Simulation"
def draw(self, _context):
layout = self.layout
node_add_menu.add_simulation_zone(layout, label="Simulation Zone")
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_category_GEO_TEXT(Menu):
bl_idname = "NODE_MT_category_GEO_TEXT"
bl_label = "Text"
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeStringJoin")
node_add_menu.add_node_type(layout, "FunctionNodeReplaceString")
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "FunctionNodeSliceString")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.separator()
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "FunctionNodeStringLength")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "GeometryNodeStringToCurves")
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "FunctionNodeValueToString")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
layout.separator()
node_add_menu.add_node_type(layout, "FunctionNodeInputSpecialCharacters")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Utilities/Text")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_category_GEO_TEXTURE(Menu):
bl_idname = "NODE_MT_category_GEO_TEXTURE"
bl_label = "Texture"
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "ShaderNodeTexBrick")
node_add_menu.add_node_type(layout, "ShaderNodeTexChecker")
node_add_menu.add_node_type(layout, "ShaderNodeTexGradient")
node_add_menu.add_node_type(layout, "GeometryNodeImageTexture")
node_add_menu.add_node_type(layout, "ShaderNodeTexMagic")
node_add_menu.add_node_type(layout, "ShaderNodeTexMusgrave")
node_add_menu.add_node_type(layout, "ShaderNodeTexNoise")
node_add_menu.add_node_type(layout, "ShaderNodeTexVoronoi")
node_add_menu.add_node_type(layout, "ShaderNodeTexWave")
node_add_menu.add_node_type(layout, "ShaderNodeTexWhiteNoise")
Nodes: Add node group assets in add menu This patch builds on the work from bdb57541475f to add node group assets directly in the node editor add menu. Assets are added after separators to distinguish them, but otherwise they look like any other node. The catalog trees from all configured libraries are used to build the menu hierarchy. Only catalogs with matching asset types are used though. There are a few limitations of this initial version. For now this only supports geometry nodes. Support for other built-in node systems just requires some refactoring of the corresponding add menu though. Lazy loading will be added in a followup commit. For now there is a label the first time the menu is opened. Like the search menu integration, re-saving asset library files in 3.4 is required, if it hasn't been done already. Implementation wise, there is a some ugly code here. A lot of that is because the asset system isn't complete. The RNA API doesn't work well yet, and the system isn't built to interact with multiple libraries at once. It's also ugly because of the way we combine automatic menu generation with builtin menus. As noted in a code comment, these two systems could be merged completely so that the menus for builtin nodes are also generated in the same way. Differential Revision: https://developer.blender.org/D16135
2022-11-01 16:09:49 +01:00
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_category_GEO_UTILITIES(Menu):
bl_idname = "NODE_MT_category_GEO_UTILITIES"
bl_label = "Utilities"
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
def draw(self, _context):
layout = self.layout
layout.menu("NODE_MT_geometry_node_GEO_COLOR")
layout.menu("NODE_MT_category_GEO_TEXT")
layout.menu("NODE_MT_category_GEO_VECTOR")
layout.separator()
layout.menu("NODE_MT_category_GEO_UTILITIES_FIELD")
layout.menu("NODE_MT_category_GEO_UTILITIES_MATH")
layout.menu("NODE_MT_category_GEO_UTILITIES_ROTATION")
layout.separator()
node_add_menu.add_node_type(layout, "FunctionNodeRandomValue")
Geometry Nodes: new Repeat Zone This adds support for running a set of nodes repeatedly. The number of iterations can be controlled dynamically as an input of the repeat zone. The repeat zone can be added in via the search or from the Add > Utilities menu. The main use case is to replace long repetitive node chains with a more flexible alternative. Technically, repeat zones can also be used for many other use cases. However, due to their serial nature, performance is very sub-optimal when they are used to solve problems that could be processed in parallel. Better solutions for such use cases will be worked on separately. Repeat zones are similar to simulation zones. The major difference is that they have no concept of time and are always evaluated entirely in the current frame, while in simulations only a single iteration is evaluated per frame. Stopping the repetition early using a dynamic condition is not yet supported. "Break" functionality can be implemented manually using Switch nodes in the loop for now. It's likely that this functionality will be built into the repeat zone in the future. For now, things are kept more simple. Remaining Todos after this first version: * Improve socket inspection and viewer node support. Currently, only the first iteration is taken into account for socket inspection and the viewer. * Make loop evaluation more lazy. Currently, the evaluation is eager, meaning that it evaluates some nodes even though their output may not be required. Pull Request: https://projects.blender.org/blender/blender/pulls/109164
2023-07-11 22:36:10 +02:00
node_add_menu.add_repeat_zone(layout, label="Repeat Zone")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeSwitch")
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
class NODE_MT_category_GEO_UTILITIES_FIELD(Menu):
bl_idname = "NODE_MT_category_GEO_UTILITIES_FIELD"
bl_label = "Field"
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeAccumulateField")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeFieldAtIndex")
node_add_menu.add_node_type(layout, "GeometryNodeFieldOnDomain")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Utilties/Field")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_category_GEO_UTILITIES_ROTATION(Menu):
bl_idname = "NODE_MT_category_GEO_UTILITIES_ROTATION"
bl_label = "Rotation"
def draw(self, _context):
layout = self.layout
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "FunctionNodeAlignEulerToVector")
Geometry Nodes: Initial basic rotation socket nodes This PR adds an initial set of nodes using the new rotation socket. 6 nodes build rotations or convert them to other formats, a 7th rotates a vector with a rotation, and the last inverts rotations. The design task #109965 describes the choice to use separate nodes for the rotation construction and separation operations. In the future, a "Switch Node" operator (#111438) will help to make working with these separated nodes faster. - **Axis Angle to Rotation** - **Rotation to Axis Angle** - **Combine Quaternion** - **Separate Quaternion** - **Euler to Rotation** - **Rotation to Euler** - **Rotate Vector** - **Invert Rotation** See #92967 Pull Request: https://projects.blender.org/blender/blender/pulls/109030
2023-08-24 14:58:55 +02:00
node_add_menu.add_node_type(layout, "FunctionNodeAxisAngleToRotation")
node_add_menu.add_node_type(layout, "FunctionNodeEulerToRotation")
node_add_menu.add_node_type(layout, "FunctionNodeInvertRotation")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
node_add_menu.add_node_type(layout, "FunctionNodeRotateEuler")
Geometry Nodes: Initial basic rotation socket nodes This PR adds an initial set of nodes using the new rotation socket. 6 nodes build rotations or convert them to other formats, a 7th rotates a vector with a rotation, and the last inverts rotations. The design task #109965 describes the choice to use separate nodes for the rotation construction and separation operations. In the future, a "Switch Node" operator (#111438) will help to make working with these separated nodes faster. - **Axis Angle to Rotation** - **Rotation to Axis Angle** - **Combine Quaternion** - **Separate Quaternion** - **Euler to Rotation** - **Rotation to Euler** - **Rotate Vector** - **Invert Rotation** See #92967 Pull Request: https://projects.blender.org/blender/blender/pulls/109030
2023-08-24 14:58:55 +02:00
node_add_menu.add_node_type(layout, "FunctionNodeRotateVector")
node_add_menu.add_node_type(layout, "FunctionNodeRotationToAxisAngle")
node_add_menu.add_node_type(layout, "FunctionNodeRotationToEuler")
node_add_menu.add_node_type(layout, "FunctionNodeRotationToQuaternion")
node_add_menu.add_node_type(layout, "FunctionNodeQuaternionToRotation")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Utilities/Rotation")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
Cleanup: make format
2023-01-16 14:39:10 +01:00
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
class NODE_MT_category_GEO_UTILITIES_MATH(Menu):
bl_idname = "NODE_MT_category_GEO_UTILITIES_MATH"
bl_label = "Math"
def draw(self, _context):
layout = self.layout
UI: Nodes re-organize the nodes in alphabetical order This was a regression introduced after the 3.3 release. This fix T101452
2022-09-29 11:08:21 +02:00
node_add_menu.add_node_type(layout, "FunctionNodeBooleanMath")
node_add_menu.add_node_type(layout, "ShaderNodeClamp")
node_add_menu.add_node_type(layout, "FunctionNodeCompare")
node_add_menu.add_node_type(layout, "ShaderNodeFloatCurve")
node_add_menu.add_node_type(layout, "FunctionNodeFloatToInt")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
node_add_menu.add_node_type(layout, "ShaderNodeMapRange")
node_add_menu.add_node_type(layout, "ShaderNodeMath")
node_add_menu.add_node_type(layout, "ShaderNodeMix")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Utilities/Math")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_category_GEO_UV(Menu):
bl_idname = "NODE_MT_category_GEO_UV"
bl_label = "UV"
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeUVPackIslands")
node_add_menu.add_node_type(layout, "GeometryNodeUVUnwrap")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Mesh/UV")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_category_GEO_VECTOR(Menu):
bl_idname = "NODE_MT_category_GEO_VECTOR"
bl_label = "Vector"
def draw(self, _context):
layout = self.layout
node_add_menu.add_node_type(layout, "ShaderNodeVectorCurve")
node_add_menu.add_node_type(layout, "ShaderNodeVectorMath")
node_add_menu.add_node_type(layout, "ShaderNodeVectorRotate")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.separator()
node_add_menu.add_node_type(layout, "ShaderNodeCombineXYZ")
props = node_add_menu.add_node_type(layout, "ShaderNodeMix", label=iface_("Mix Vector"))
ops = props.settings.add()
ops.name = "data_type"
ops.value = "'VECTOR'"
node_add_menu.add_node_type(layout, "ShaderNodeSeparateXYZ")
Geometry Nodes: Fix Support for extending nested menus with assets The builtin asset catalog paths weren't properly updated after more nesting was added to the geometry nodes add menu. This commit resolves that and a few other issues extending menus like nested menus in mesh edit mode. Unfortunately this requires some boilerplate code duplicating the menu structure currently.
2023-09-26 17:01:30 -04:00
node_add_menu.draw_assets_for_catalog(layout, "Utilities/Vector")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_category_GEO_VOLUME(Menu):
bl_idname = "NODE_MT_category_GEO_VOLUME"
bl_label = "Volume"
I18n: disambiguate a few messages - "Lens" can be a transparent object used in cameras, or specifically its property of focal length - "Empty" can be an adjective meaning void, or an object type. The latter is already disambiguated using `ID_ID` - "New" and "Old" are adjectives that can have agreements in some languages - "Modified" is an adjective that can have agreement in some languages - "Clipping" can be a property of a camera, or a behavior of the mirror modifier - "Value" in HSV nodes, see #105113 - "Area" in the Face Area geometry node, can mean a measurement or a window type - "New" is an adjective that can have agreement - "Tab" can be a UI element or a whitespace character - "Volume" can mean a measurement or an object type. The latter is already disambiguated using `ID_ID` These changes introduce the new `BLT_I18NCONTEXT_TIME` translation context. They also remove `BLT_I18NCONTEXT_VIRTUAL_REALITY`, which I added at one point but then couldn't find which messages I wanted to fix with it. Ref #43295 Pull Request: #106718
2023-02-23 22:00:57 +01:00
bl_translation_context = i18n_contexts.id_id
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: remove unused argument signified from used arguments in Python Also simplify import for `_bpy._utils_previews`.
2023-03-23 15:31:14 +11:00
def draw(self, context):
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeVolumeCube")
node_add_menu.add_node_type(layout, "GeometryNodeVolumeToMesh")
Cleanup: remove unused argument signified from used arguments in Python Also simplify import for `_bpy._utils_previews`.
2023-03-23 15:31:14 +11:00
if context.preferences.experimental.use_new_volume_nodes:
Nodes: SDF Volume nodes milestone 1 Geometry Nodes: SDF Volume nodes milestone 1 Adds initial support for SDF volume creation and manipulation. `SDF volume` is Blender's name of an OpenVDB grid of type Level Set. See the discussion about naming in #91668. The new nodes are: - Mesh to SDF Volume: Converts a mesh to an SDF Volume - Points to SDF Volume: Converts points to an SDF Volume - Mean Filter SDF Volume: Applies a Mean Filter to an SDF - Offset SDF Volume: Applies an offset to an SDF - SDF Volume Sphere: Creates an SDF Volume in the shape of a sphere For now an experimental option `New Volume Nodes` needs to be enabled in Blender preferences for the nodes to be visible. See the current work plan for Volume Nodes in #103248. Pull Request: https://projects.blender.org/blender/blender/pulls/105090
2023-03-19 11:21:08 +01:00
layout.separator()
node_add_menu.add_node_type(layout, "GeometryNodeMeanFilterSDFVolume")
node_add_menu.add_node_type(layout, "GeometryNodeOffsetSDFVolume")
Geometry Nodes: Add Sample Volume node This commit adds a new experimental node "Sample Volume". It's purpose is to be able to sample values from a volume grid given a position field. The 'Grid' input accepts a named attribute input with the name of the volume grid to sample. Values will be implicitly converted from the grid type to the specified value type. Pull Request: #107656
2023-05-16 19:08:08 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeSampleVolume")
Nodes: SDF Volume nodes milestone 1 Geometry Nodes: SDF Volume nodes milestone 1 Adds initial support for SDF volume creation and manipulation. `SDF volume` is Blender's name of an OpenVDB grid of type Level Set. See the discussion about naming in #91668. The new nodes are: - Mesh to SDF Volume: Converts a mesh to an SDF Volume - Points to SDF Volume: Converts points to an SDF Volume - Mean Filter SDF Volume: Applies a Mean Filter to an SDF - Offset SDF Volume: Applies an offset to an SDF - SDF Volume Sphere: Creates an SDF Volume in the shape of a sphere For now an experimental option `New Volume Nodes` needs to be enabled in Blender preferences for the nodes to be visible. See the current work plan for Volume Nodes in #103248. Pull Request: https://projects.blender.org/blender/blender/pulls/105090
2023-03-19 11:21:08 +01:00
node_add_menu.add_node_type(layout, "GeometryNodeSDFVolumeSphere")
Geometry Nodes: Add 'Signed Distance' input node Adds an input node Signed Distance that can be used to refer to the distance-grid of an SDF volume. Right now it's experimental and can be enabled by enabling "New Volume Nodes" in the preferences. It returns a float AttributeFieldInput called 'distance' which can tell Volume nodes which grid to get. See #103248.
2023-05-11 18:25:34 +02:00
node_add_menu.add_node_type(layout, "GeometryNodeInputSignedDistance")
Nodes: Add node group assets in add menu This patch builds on the work from bdb57541475f to add node group assets directly in the node editor add menu. Assets are added after separators to distinguish them, but otherwise they look like any other node. The catalog trees from all configured libraries are used to build the menu hierarchy. Only catalogs with matching asset types are used though. There are a few limitations of this initial version. For now this only supports geometry nodes. Support for other built-in node systems just requires some refactoring of the corresponding add menu though. Lazy loading will be added in a followup commit. For now there is a label the first time the menu is opened. Like the search menu integration, re-saving asset library files in 3.4 is required, if it hasn't been done already. Implementation wise, there is a some ugly code here. A lot of that is because the asset system isn't complete. The RNA API doesn't work well yet, and the system isn't built to interact with multiple libraries at once. It's also ugly because of the way we combine automatic menu generation with builtin menus. As noted in a code comment, these two systems could be merged completely so that the menus for builtin nodes are also generated in the same way. Differential Revision: https://developer.blender.org/D16135
2022-11-01 16:09:49 +01:00
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_category_GEO_GROUP(Menu):
bl_idname = "NODE_MT_category_GEO_GROUP"
bl_label = "Group"
def draw(self, context):
layout = self.layout
node_add_menu.draw_node_group_add_menu(context, layout)
Nodes: Add node group assets in add menu This patch builds on the work from bdb57541475f to add node group assets directly in the node editor add menu. Assets are added after separators to distinguish them, but otherwise they look like any other node. The catalog trees from all configured libraries are used to build the menu hierarchy. Only catalogs with matching asset types are used though. There are a few limitations of this initial version. For now this only supports geometry nodes. Support for other built-in node systems just requires some refactoring of the corresponding add menu though. Lazy loading will be added in a followup commit. For now there is a label the first time the menu is opened. Like the search menu integration, re-saving asset library files in 3.4 is required, if it hasn't been done already. Implementation wise, there is a some ugly code here. A lot of that is because the asset system isn't complete. The RNA API doesn't work well yet, and the system isn't built to interact with multiple libraries at once. It's also ugly because of the way we combine automatic menu generation with builtin menus. As noted in a code comment, these two systems could be merged completely so that the menus for builtin nodes are also generated in the same way. Differential Revision: https://developer.blender.org/D16135
2022-11-01 16:09:49 +01:00
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
Cleanup: format
2022-09-27 16:36:27 +10:00
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
class NODE_MT_geometry_node_add_all(Menu):
bl_idname = "NODE_MT_geometry_node_add_all"
bl_label = ""
Geometry Nodes: Initial tool-specific nodes Add three new nodes for operations and inputs specific to node group operators. - **Selection** Whether elements are selected in the viewport - **Set Selection** Sets the edit/sculpt selection, on the point, face, or curve domains - **3D Cursor** Gives the location and rotation of the 3D cursor, in the local space of the modified object. - **Face Set** The face set value from mesh sculpt mode, and whether the attribute exists. - **Set Face Set** Set sculpt face set values. In the add menu and search, the nodes are only visible in the "Tool" context of the geometry node editor. They also give errors when executed by a modifier. Pull Request: https://projects.blender.org/blender/blender/pulls/109517
2023-08-04 20:59:04 +02:00
def draw(self, context):
snode = context.space_data
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
layout = self.layout
layout.menu("NODE_MT_geometry_node_GEO_ATTRIBUTE")
layout.menu("NODE_MT_geometry_node_GEO_INPUT")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.menu("NODE_MT_category_GEO_OUTPUT")
layout.separator()
layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY")
layout.separator()
layout.menu("NODE_MT_geometry_node_GEO_CURVE")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
layout.menu("NODE_MT_geometry_node_GEO_INSTANCE")
layout.menu("NODE_MT_geometry_node_GEO_MESH")
layout.menu("NODE_MT_category_GEO_POINT")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.menu("NODE_MT_category_GEO_VOLUME")
layout.separator()
Geometry Nodes: add simulation support This adds support for building simulations with geometry nodes. A new `Simulation Input` and `Simulation Output` node allow maintaining a simulation state across multiple frames. Together these two nodes form a `simulation zone` which contains all the nodes that update the simulation state from one frame to the next. A new simulation zone can be added via the menu (`Simulation > Simulation Zone`) or with the node add search. The simulation state contains a geometry by default. However, it is possible to add multiple geometry sockets as well as other socket types. Currently, field inputs are evaluated and stored for the preceding geometry socket in the order that the sockets are shown. Simulation state items can be added by linking one of the empty sockets to something else. In the sidebar, there is a new panel that allows adding, removing and reordering these sockets. The simulation nodes behave as follows: * On the first frame, the inputs of the `Simulation Input` node are evaluated to initialize the simulation state. In later frames these sockets are not evaluated anymore. The `Delta Time` at the first frame is zero, but the simulation zone is still evaluated. * On every next frame, the `Simulation Input` node outputs the simulation state of the previous frame. Nodes in the simulation zone can edit that data in arbitrary ways, also taking into account the `Delta Time`. The new simulation state has to be passed to the `Simulation Output` node where it is cached and forwarded. * On a frame that is already cached or baked, the nodes in the simulation zone are not evaluated, because the `Simulation Output` node can return the previously cached data directly. It is not allowed to connect sockets from inside the simulation zone to the outside without going through the `Simulation Output` node. This is a necessary restriction to make caching and sub-frame interpolation work. Links can go into the simulation zone without problems though. Anonymous attributes are not propagated by the simulation nodes unless they are explicitly stored in the simulation state. This is unfortunate, but currently there is no practical and reliable alternative. The core problem is detecting which anonymous attributes will be required for the simulation and afterwards. While we can detect this for the current evaluation, we can't look into the future in time to see what data will be necessary. We intend to make it easier to explicitly pass data through a simulation in the future, even if the simulation is in a nested node group. There is a new `Simulation Nodes` panel in the physics tab in the properties editor. It allows baking all simulation zones on the selected objects. The baking options are intentially kept at a minimum for this MVP. More features for simulation baking as well as baking in general can be expected to be added separately. All baked data is stored on disk in a folder next to the .blend file. #106937 describes how baking is implemented in more detail. Volumes can not be baked yet and materials are lost during baking for now. Packing the baked data into the .blend file is not yet supported. The timeline indicates which frames are currently cached, baked or cached but invalidated by user-changes. Simulation input and output nodes are internally linked together by their `bNode.identifier` which stays the same even if the node name changes. They are generally added and removed together. However, there are still cases where "dangling" simulation nodes can be created currently. Those generally don't cause harm, but would be nice to avoid this in more cases in the future. Co-authored-by: Hans Goudey <h.goudey@me.com> Co-authored-by: Lukas Tönne <lukas@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/104924
2023-05-03 13:18:51 +02:00
layout.menu("NODE_MT_category_simulation")
layout.separator()
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.menu("NODE_MT_geometry_node_GEO_MATERIAL")
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
layout.menu("NODE_MT_category_GEO_TEXTURE")
layout.menu("NODE_MT_category_GEO_UTILITIES")
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
layout.separator()
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
layout.menu("NODE_MT_category_GEO_GROUP")
Shading Nodes: Refactor Add menu Refactor the Add menu in Shading nodes, with manually created menus, inspired by Geometry Nodes and more recently the Compositor. Minor sorting adjustments by splitting categories in groups, with separators in between groups, and sorted alphabetically. Shading node group assets are also populated in the menus. This is the first part of the re-organization of the Add menu, part of #111746 Pull Request: https://projects.blender.org/blender/blender/pulls/111798
2023-09-01 20:46:12 +02:00
layout.menu("NODE_MT_category_layout")
Nodes: Add node group assets in add menu This patch builds on the work from bdb57541475f to add node group assets directly in the node editor add menu. Assets are added after separators to distinguish them, but otherwise they look like any other node. The catalog trees from all configured libraries are used to build the menu hierarchy. Only catalogs with matching asset types are used though. There are a few limitations of this initial version. For now this only supports geometry nodes. Support for other built-in node systems just requires some refactoring of the corresponding add menu though. Lazy loading will be added in a followup commit. For now there is a label the first time the menu is opened. Like the search menu integration, re-saving asset library files in 3.4 is required, if it hasn't been done already. Implementation wise, there is a some ugly code here. A lot of that is because the asset system isn't complete. The RNA API doesn't work well yet, and the system isn't built to interact with multiple libraries at once. It's also ugly because of the way we combine automatic menu generation with builtin menus. As noted in a code comment, these two systems could be merged completely so that the menus for builtin nodes are also generated in the same way. Differential Revision: https://developer.blender.org/D16135
2022-11-01 16:09:49 +01:00
node_add_menu.draw_root_assets(layout)
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
classes = (
NODE_MT_geometry_node_add_all,
NODE_MT_geometry_node_GEO_ATTRIBUTE,
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
NODE_MT_geometry_node_GEO_INPUT,
NODE_MT_geometry_node_GEO_INPUT_CONSTANT,
NODE_MT_geometry_node_GEO_INPUT_GROUP,
NODE_MT_geometry_node_GEO_INPUT_SCENE,
NODE_MT_category_GEO_OUTPUT,
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
NODE_MT_geometry_node_GEO_CURVE,
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
NODE_MT_geometry_node_GEO_CURVE_READ,
Geometry Nodes: Tweak menu location of sample nodes There was an inconsistency between geometry sample nodes and mesh/curve sample nodes, where the latter didn't have a special "Sample" category, and we categorized as "Operations", which they were not. Also put the sample category between "Read" and "Write" since the verb name is more consistent and sampling is an advanced form of reading.
2023-02-03 16:26:30 -05:00
NODE_MT_geometry_node_GEO_CURVE_SAMPLE,
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
NODE_MT_geometry_node_GEO_CURVE_WRITE,
NODE_MT_geometry_node_GEO_CURVE_OPERATIONS,
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE,
Geometry Nodes: Curve and mesh topology access nodes This patch contains an initial set of nodes to access basic mesh topology information, as explored in T100020. The nodes allow six direct topology mappings for meshes: - **Corner -> Face** The face a corner is in, the index in the face - **Vertex -> Edge** Choose an edge attached to the vertex - **Vertex -> Corner** Choose a corner attached to the vertex - **Corner -> Edge** The next and previous edge at each face corner - **Corner -> Vertex** The vertex associated with a corner - **Corner -> Corner** Offset a corner index within a face And two new topology mappings for curves: - **Curve -> Points** Choose a point within a curve - **Point -> Curve** The curve a point is in, the index in the curve The idea is that some of the 16 possible mesh mappings are more important, and that this is a useful set of nodes to start exploring this area. For mappings with an arbitrary number of connections, we must sort them and use an index to choose a single element, because geometry nodes does not support list fields. Note that the sort index has repeating behavior as it goes over the "Total" number of connections, and negative sort indices choose from the end. Currently which of the "start" elements is used is determined by the field context, so the "Field at Index" and "Interpolate Domain" nodes will be quite important. Also, currently the "Sort Index" inputs are clamped to the number of connections. One important feature that isn't implemented here is using the winding order for the output elements. This can be a separate mode for some of these nodes. It will be optional because of the performance impact. There are several todos for separate commits after this: - Rename "Control Point Neighbors" to be consistent with this naming - Version away the "Vertex Neighbors" node which is fully redundant now - Implement a special case for when no weights are used for performance - De-duplicating some of the sorting logic between the nodes - Improve performance and memory use of topology mappings - Look into caching some of the mappings on meshes Differential Revision: https://developer.blender.org/D16029
2022-09-28 14:38:27 -05:00
NODE_MT_geometry_node_curve_topology,
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
NODE_MT_geometry_node_GEO_GEOMETRY,
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
NODE_MT_geometry_node_GEO_GEOMETRY_READ,
NODE_MT_geometry_node_GEO_GEOMETRY_WRITE,
NODE_MT_geometry_node_GEO_GEOMETRY_OPERATIONS,
NODE_MT_geometry_node_GEO_GEOMETRY_SAMPLE,
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
NODE_MT_geometry_node_GEO_INSTANCE,
NODE_MT_geometry_node_GEO_MESH,
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
NODE_MT_geometry_node_GEO_MESH_READ,
Geometry Nodes: Tweak menu location of sample nodes There was an inconsistency between geometry sample nodes and mesh/curve sample nodes, where the latter didn't have a special "Sample" category, and we categorized as "Operations", which they were not. Also put the sample category between "Read" and "Write" since the verb name is more consistent and sampling is an advanced form of reading.
2023-02-03 16:26:30 -05:00
NODE_MT_geometry_node_GEO_MESH_SAMPLE,
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
NODE_MT_geometry_node_GEO_MESH_WRITE,
NODE_MT_geometry_node_GEO_MESH_OPERATIONS,
NODE_MT_category_GEO_UV,
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
NODE_MT_category_PRIMITIVES_MESH,
Geometry Nodes: Curve and mesh topology access nodes This patch contains an initial set of nodes to access basic mesh topology information, as explored in T100020. The nodes allow six direct topology mappings for meshes: - **Corner -> Face** The face a corner is in, the index in the face - **Vertex -> Edge** Choose an edge attached to the vertex - **Vertex -> Corner** Choose a corner attached to the vertex - **Corner -> Edge** The next and previous edge at each face corner - **Corner -> Vertex** The vertex associated with a corner - **Corner -> Corner** Offset a corner index within a face And two new topology mappings for curves: - **Curve -> Points** Choose a point within a curve - **Point -> Curve** The curve a point is in, the index in the curve The idea is that some of the 16 possible mesh mappings are more important, and that this is a useful set of nodes to start exploring this area. For mappings with an arbitrary number of connections, we must sort them and use an index to choose a single element, because geometry nodes does not support list fields. Note that the sort index has repeating behavior as it goes over the "Total" number of connections, and negative sort indices choose from the end. Currently which of the "start" elements is used is determined by the field context, so the "Field at Index" and "Interpolate Domain" nodes will be quite important. Also, currently the "Sort Index" inputs are clamped to the number of connections. One important feature that isn't implemented here is using the winding order for the output elements. This can be a separate mode for some of these nodes. It will be optional because of the performance impact. There are several todos for separate commits after this: - Rename "Control Point Neighbors" to be consistent with this naming - Version away the "Vertex Neighbors" node which is fully redundant now - Implement a special case for when no weights are used for performance - De-duplicating some of the sorting logic between the nodes - Improve performance and memory use of topology mappings - Look into caching some of the mappings on meshes Differential Revision: https://developer.blender.org/D16029
2022-09-28 14:38:27 -05:00
NODE_MT_geometry_node_mesh_topology,
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
NODE_MT_category_GEO_POINT,
Geometry Nodes: add simulation support This adds support for building simulations with geometry nodes. A new `Simulation Input` and `Simulation Output` node allow maintaining a simulation state across multiple frames. Together these two nodes form a `simulation zone` which contains all the nodes that update the simulation state from one frame to the next. A new simulation zone can be added via the menu (`Simulation > Simulation Zone`) or with the node add search. The simulation state contains a geometry by default. However, it is possible to add multiple geometry sockets as well as other socket types. Currently, field inputs are evaluated and stored for the preceding geometry socket in the order that the sockets are shown. Simulation state items can be added by linking one of the empty sockets to something else. In the sidebar, there is a new panel that allows adding, removing and reordering these sockets. The simulation nodes behave as follows: * On the first frame, the inputs of the `Simulation Input` node are evaluated to initialize the simulation state. In later frames these sockets are not evaluated anymore. The `Delta Time` at the first frame is zero, but the simulation zone is still evaluated. * On every next frame, the `Simulation Input` node outputs the simulation state of the previous frame. Nodes in the simulation zone can edit that data in arbitrary ways, also taking into account the `Delta Time`. The new simulation state has to be passed to the `Simulation Output` node where it is cached and forwarded. * On a frame that is already cached or baked, the nodes in the simulation zone are not evaluated, because the `Simulation Output` node can return the previously cached data directly. It is not allowed to connect sockets from inside the simulation zone to the outside without going through the `Simulation Output` node. This is a necessary restriction to make caching and sub-frame interpolation work. Links can go into the simulation zone without problems though. Anonymous attributes are not propagated by the simulation nodes unless they are explicitly stored in the simulation state. This is unfortunate, but currently there is no practical and reliable alternative. The core problem is detecting which anonymous attributes will be required for the simulation and afterwards. While we can detect this for the current evaluation, we can't look into the future in time to see what data will be necessary. We intend to make it easier to explicitly pass data through a simulation in the future, even if the simulation is in a nested node group. There is a new `Simulation Nodes` panel in the physics tab in the properties editor. It allows baking all simulation zones on the selected objects. The baking options are intentially kept at a minimum for this MVP. More features for simulation baking as well as baking in general can be expected to be added separately. All baked data is stored on disk in a folder next to the .blend file. #106937 describes how baking is implemented in more detail. Volumes can not be baked yet and materials are lost during baking for now. Packing the baked data into the .blend file is not yet supported. The timeline indicates which frames are currently cached, baked or cached but invalidated by user-changes. Simulation input and output nodes are internally linked together by their `bNode.identifier` which stays the same even if the node name changes. They are generally added and removed together. However, there are still cases where "dangling" simulation nodes can be created currently. Those generally don't cause harm, but would be nice to avoid this in more cases in the future. Co-authored-by: Hans Goudey <h.goudey@me.com> Co-authored-by: Lukas Tönne <lukas@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/104924
2023-05-03 13:18:51 +02:00
NODE_MT_category_simulation,
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
NODE_MT_category_GEO_VOLUME,
NODE_MT_geometry_node_GEO_MATERIAL,
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
NODE_MT_category_GEO_TEXTURE,
NODE_MT_category_GEO_UTILITIES,
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
NODE_MT_geometry_node_GEO_COLOR,
NODE_MT_category_GEO_TEXT,
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
NODE_MT_category_GEO_VECTOR,
User Interface: Re-organization of Geometry Nodes Add Node Menu The menus are growing too large. This patches move some categories under sub-menus, and shuffle some entries around. We already had sub-categories split by separators. This change now goes a step further and embrace 3-level menus. Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear back to know Quackers real name). Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II. Differential Revision: https://developer.blender.org/D16993
2023-01-09 18:09:22 +01:00
NODE_MT_category_GEO_UTILITIES_FIELD,
NODE_MT_category_GEO_UTILITIES_MATH,
NODE_MT_category_GEO_UTILITIES_ROTATION,
Nodes: Use plain menus for geometry nodes add menu At the cost of slightly more boilerplate code, we can avoid the `NodeItem` and `NodeCategory` abstractions used to build the node add menu. This makes the menus more flexible and more obvious, which will make them easier to extend with assets. The identifiers for the new menu types are inconsistent with regular class naming for backwards compatibility with the old "category" menu naming. Also adds an item for the "Self Object" node missed in dd5131bd700c. Differential Revision: https://developer.blender.org/D15973
2022-09-26 12:36:13 -05:00
NODE_MT_category_GEO_GROUP,
)
if __name__ == "__main__": # only for live edit.
from bpy.utils import register_class
for cls in classes:
register_class(cls)
Reference in New Issue Copy Permalink