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
This commit is contained in:
parent
2fb829a2de
commit
d4e638baac
|
|
@ -12,9 +12,10 @@ class NODE_MT_geometry_node_GEO_ATTRIBUTE(Menu):
|
|||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeAttributeStatistic")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeAttributeDomainSize")
|
||||
layout.separator()
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeBlurAttribute")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeCaptureAttribute")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeAttributeDomainSize")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeRemoveAttribute")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeStoreNamedAttribute")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
|
@ -27,12 +28,13 @@ class NODE_MT_geometry_node_GEO_COLOR(Menu):
|
|||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeValToRGB")
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeRGBCurve")
|
||||
layout.separator()
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeCombineColor")
|
||||
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, "ShaderNodeRGBCurve")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeSeparateColor")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
|
@ -43,19 +45,23 @@ class NODE_MT_geometry_node_GEO_CURVE(Menu):
|
|||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeCurveLength")
|
||||
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")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeResampleCurve")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeReverseCurve")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSampleCurve")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSubdivideCurve")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeTrimCurve")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_CURVE_READ")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_CURVE_WRITE")
|
||||
layout.separator()
|
||||
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
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputCurveHandlePositions")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeCurveLength")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputTangent")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputCurveTilt")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeCurveEndpointSelection")
|
||||
|
|
@ -64,7 +70,14 @@ class NODE_MT_geometry_node_GEO_CURVE(Menu):
|
|||
node_add_menu.add_node_type(layout, "GeometryNodeSplineLength")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSplineParameter")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputSplineResolution")
|
||||
layout.separator()
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
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
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSetCurveNormal")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSetCurveRadius")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSetCurveTilt")
|
||||
|
|
@ -76,9 +89,28 @@ class NODE_MT_geometry_node_GEO_CURVE(Menu):
|
|||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
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")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeResampleCurve")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeReverseCurve")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSampleCurve")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSubdivideCurve")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeTrimCurve")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
class NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE(Menu):
|
||||
bl_idname = "NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE"
|
||||
bl_label = "Curve Primitives"
|
||||
bl_label = "Primitives"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
|
|
@ -95,7 +127,7 @@ class NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE(Menu):
|
|||
|
||||
class NODE_MT_geometry_node_curve_topology(Menu):
|
||||
bl_idname = "NODE_MT_geometry_node_curve_topology"
|
||||
bl_label = "Curve Topology"
|
||||
bl_label = "Topology"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
|
|
@ -109,25 +141,69 @@ class NODE_MT_geometry_node_GEO_GEOMETRY(Menu):
|
|||
bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY"
|
||||
bl_label = "Geometry"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_READ")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_WRITE")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_OPERATIONS")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_SAMPLE")
|
||||
layout.separator()
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeJoinGeometry")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeGeometryToInstance")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
class NODE_MT_geometry_node_GEO_GEOMETRY_READ(Menu):
|
||||
bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY_READ"
|
||||
bl_label = "Read"
|
||||
|
||||
def draw(self, _context):
|
||||
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")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
class NODE_MT_geometry_node_GEO_GEOMETRY_WRITE(Menu):
|
||||
bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY_WRITE"
|
||||
bl_label = "Write"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSetID")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSetPosition")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
class NODE_MT_geometry_node_GEO_GEOMETRY_OPERATIONS(Menu):
|
||||
bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY_OPERATIONS"
|
||||
bl_label = "Operations"
|
||||
|
||||
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, "GeometryNodeProximity")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeGeometryToInstance")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeJoinGeometry")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeMergeByDistance")
|
||||
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")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
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")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeRaycast")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSampleIndex")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSampleNearest")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSeparateComponents")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSeparateGeometry")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeTransform")
|
||||
layout.separator()
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSetID")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSetPosition")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
|
|
@ -135,28 +211,52 @@ class NODE_MT_geometry_node_GEO_INPUT(Menu):
|
|||
bl_idname = "NODE_MT_geometry_node_GEO_INPUT"
|
||||
bl_label = "Input"
|
||||
|
||||
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"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeInputBool")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeCollectionInfo")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeInputColor")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputImage")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeImageInfo")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeInputInt")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeIsViewport")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMaterial")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeObjectInfo")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSelfObject")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeInputString")
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeValue")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeInputVector")
|
||||
layout.separator()
|
||||
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")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
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")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
class NODE_MT_geometry_node_GEO_INPUT_SCENE(Menu):
|
||||
bl_idname = "NODE_MT_geometry_node_GEO_INPUT_SCENE"
|
||||
bl_label = "Scene"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
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")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSelfObject")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputSceneTime")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
|
@ -169,6 +269,7 @@ class NODE_MT_geometry_node_GEO_INSTANCE(Menu):
|
|||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInstanceOnPoints")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInstancesToPoints")
|
||||
layout.separator()
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeRealizeInstances")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeRotateInstances")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeScaleInstances")
|
||||
|
|
@ -199,6 +300,52 @@ class NODE_MT_geometry_node_GEO_MESH(Menu):
|
|||
bl_idname = "NODE_MT_geometry_node_GEO_MESH"
|
||||
bl_label = "Mesh"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
layout.menu("NODE_MT_geometry_node_GEO_MESH_READ")
|
||||
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"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshEdgeAngle")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshEdgeNeighbors")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshEdgeVertices")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshFaceArea")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshFaceNeighbors")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeMeshFaceSetBoundaries")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshFaceIsPlanar")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputShadeSmooth")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshIsland")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputShortestEdgePaths")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshVertexNeighbors")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
class NODE_MT_geometry_node_GEO_MESH_WRITE(Menu):
|
||||
bl_idname = "NODE_MT_geometry_node_GEO_MESH_WRITE"
|
||||
bl_label = "Write"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSetShadeSmooth")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
class NODE_MT_geometry_node_GEO_MESH_OPERATIONS(Menu):
|
||||
bl_idname = "NODE_MT_geometry_node_GEO_MESH_OPERATIONS"
|
||||
bl_label = "Operations"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeDualMesh")
|
||||
|
|
@ -217,26 +364,12 @@ class NODE_MT_geometry_node_GEO_MESH(Menu):
|
|||
node_add_menu.add_node_type(layout, "GeometryNodeSubdivideMesh")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSubdivisionSurface")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeTriangulate")
|
||||
layout.separator()
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshEdgeAngle")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshEdgeNeighbors")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshEdgeVertices")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshFaceArea")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshFaceNeighbors")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeMeshFaceSetBoundaries")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshFaceIsPlanar")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputShadeSmooth")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshIsland")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputShortestEdgePaths")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeInputMeshVertexNeighbors")
|
||||
layout.separator()
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSetShadeSmooth")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
class NODE_MT_category_PRIMITIVES_MESH(Menu):
|
||||
bl_idname = "NODE_MT_category_PRIMITIVES_MESH"
|
||||
bl_label = "Mesh Primitives"
|
||||
bl_label = "Primitives"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
|
|
@ -253,7 +386,7 @@ class NODE_MT_category_PRIMITIVES_MESH(Menu):
|
|||
|
||||
class NODE_MT_geometry_node_mesh_topology(Menu):
|
||||
bl_idname = "NODE_MT_geometry_node_mesh_topology"
|
||||
bl_label = "Mesh Topology"
|
||||
bl_label = "Topology"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
|
|
@ -273,6 +406,7 @@ class NODE_MT_category_GEO_OUTPUT(Menu):
|
|||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "NodeGroupOutput")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeViewer")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
|
@ -285,6 +419,7 @@ class NODE_MT_category_GEO_POINT(Menu):
|
|||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeDistributePointsInVolume")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeDistributePointsOnFaces")
|
||||
layout.separator()
|
||||
node_add_menu.add_node_type(layout, "GeometryNodePoints")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodePointsToVertices")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodePointsToVolume")
|
||||
|
|
@ -302,6 +437,7 @@ class NODE_MT_category_GEO_TEXT(Menu):
|
|||
node_add_menu.add_node_type(layout, "GeometryNodeStringJoin")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeReplaceString")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeSliceString")
|
||||
layout.separator()
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeStringLength")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeStringToCurves")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeValueToString")
|
||||
|
|
@ -333,23 +469,57 @@ class NODE_MT_category_GEO_UTILITIES(Menu):
|
|||
bl_idname = "NODE_MT_category_GEO_UTILITIES"
|
||||
bl_label = "Utilities"
|
||||
|
||||
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")
|
||||
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"
|
||||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeAccumulateField")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeFieldAtIndex")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeFieldOnDomain")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
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
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeAlignEulerToVector")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeRotateEuler")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
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
|
||||
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, "GeometryNodeFieldAtIndex")
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeFloatCurve")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeFloatToInt")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeFieldOnDomain")
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeMapRange")
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeMath")
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeMix")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeRandomValue")
|
||||
node_add_menu.add_node_type(layout, "FunctionNodeRotateEuler")
|
||||
node_add_menu.add_node_type(layout, "GeometryNodeSwitch")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
|
|
@ -370,11 +540,16 @@ class NODE_MT_category_GEO_VECTOR(Menu):
|
|||
|
||||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeCombineXYZ")
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeSeparateXYZ")
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeVectorCurve")
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeVectorMath")
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeVectorRotate")
|
||||
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")
|
||||
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
|
||||
|
||||
|
||||
|
|
@ -417,25 +592,21 @@ class NODE_MT_geometry_node_add_all(Menu):
|
|||
def draw(self, _context):
|
||||
layout = self.layout
|
||||
layout.menu("NODE_MT_geometry_node_GEO_ATTRIBUTE")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_COLOR")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_CURVE")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE")
|
||||
layout.menu("NODE_MT_geometry_node_curve_topology")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_INPUT")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_INSTANCE")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_MATERIAL")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_MESH")
|
||||
layout.menu("NODE_MT_category_PRIMITIVES_MESH")
|
||||
layout.menu("NODE_MT_geometry_node_mesh_topology")
|
||||
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")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_INSTANCE")
|
||||
layout.menu("NODE_MT_geometry_node_GEO_MESH")
|
||||
layout.menu("NODE_MT_category_GEO_POINT")
|
||||
layout.menu("NODE_MT_category_GEO_TEXT")
|
||||
layout.menu("NODE_MT_category_GEO_VOLUME")
|
||||
layout.separator()
|
||||
layout.menu("NODE_MT_geometry_node_GEO_MATERIAL")
|
||||
layout.menu("NODE_MT_category_GEO_TEXTURE")
|
||||
layout.menu("NODE_MT_category_GEO_UTILITIES")
|
||||
layout.menu("NODE_MT_category_GEO_UV")
|
||||
layout.menu("NODE_MT_category_GEO_VECTOR")
|
||||
layout.menu("NODE_MT_category_GEO_VOLUME")
|
||||
layout.separator()
|
||||
layout.menu("NODE_MT_category_GEO_GROUP")
|
||||
layout.menu("NODE_MT_category_GEO_LAYOUT")
|
||||
node_add_menu.draw_root_assets(layout)
|
||||
|
|
@ -444,25 +615,41 @@ class NODE_MT_geometry_node_add_all(Menu):
|
|||
classes = (
|
||||
NODE_MT_geometry_node_add_all,
|
||||
NODE_MT_geometry_node_GEO_ATTRIBUTE,
|
||||
NODE_MT_geometry_node_GEO_COLOR,
|
||||
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,
|
||||
NODE_MT_geometry_node_GEO_CURVE,
|
||||
NODE_MT_geometry_node_GEO_CURVE_READ,
|
||||
NODE_MT_geometry_node_GEO_CURVE_WRITE,
|
||||
NODE_MT_geometry_node_GEO_CURVE_OPERATIONS,
|
||||
NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE,
|
||||
NODE_MT_geometry_node_curve_topology,
|
||||
NODE_MT_geometry_node_GEO_GEOMETRY,
|
||||
NODE_MT_geometry_node_GEO_INPUT,
|
||||
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,
|
||||
NODE_MT_geometry_node_GEO_INSTANCE,
|
||||
NODE_MT_geometry_node_GEO_MATERIAL,
|
||||
NODE_MT_geometry_node_GEO_MESH,
|
||||
NODE_MT_geometry_node_GEO_MESH_READ,
|
||||
NODE_MT_geometry_node_GEO_MESH_WRITE,
|
||||
NODE_MT_geometry_node_GEO_MESH_OPERATIONS,
|
||||
NODE_MT_category_GEO_UV,
|
||||
NODE_MT_category_PRIMITIVES_MESH,
|
||||
NODE_MT_geometry_node_mesh_topology,
|
||||
NODE_MT_category_GEO_OUTPUT,
|
||||
NODE_MT_category_GEO_POINT,
|
||||
NODE_MT_category_GEO_TEXT,
|
||||
NODE_MT_category_GEO_VOLUME,
|
||||
NODE_MT_geometry_node_GEO_MATERIAL,
|
||||
NODE_MT_category_GEO_TEXTURE,
|
||||
NODE_MT_category_GEO_UTILITIES,
|
||||
NODE_MT_category_GEO_UV,
|
||||
NODE_MT_geometry_node_GEO_COLOR,
|
||||
NODE_MT_category_GEO_TEXT,
|
||||
NODE_MT_category_GEO_VECTOR,
|
||||
NODE_MT_category_GEO_VOLUME,
|
||||
NODE_MT_category_GEO_UTILITIES_FIELD,
|
||||
NODE_MT_category_GEO_UTILITIES_MATH,
|
||||
NODE_MT_category_GEO_UTILITIES_ROTATION,
|
||||
NODE_MT_category_GEO_GROUP,
|
||||
NODE_MT_category_GEO_LAYOUT,
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue