Skip to content

Commit 057a15b

Browse files
committed
feat: more geo/shader node updates
1 parent e172793 commit 057a15b

File tree

3 files changed

+38
-9
lines changed

3 files changed

+38
-9
lines changed

geometry/node_settings.py

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
# Input > Scene
7272
'GeometryNodeTool3DCursor' : [],
7373

74+
'GeometryNodeInputActiveCamera' : [],
75+
7476
'GeometryNodeCollectionInfo' : [
7577
NTPNodeSetting("transform_space", ST.ENUM)
7678
],
@@ -138,6 +140,9 @@
138140
'GeometryNodeToolSetSelection' : [],
139141

140142
# Geometry > Operations
143+
'GeometryNodeBake' : [ #TODO
144+
],
145+
141146
'GeometryNodeBoundBox' : [],
142147
'GeometryNodeConvexHull' : [],
143148

@@ -154,6 +159,10 @@
154159
NTPNodeSetting("mode", ST.ENUM, min_version = (3, 1, 0))
155160
],
156161

162+
'GeometryNodeSortElements' : [
163+
NTPNodeSetting("domain", ST.ENUM, min_version = (4, 1, 0))
164+
],
165+
157166
'GeometryNodeTransform' : [],
158167
'GeometryNodeSeparateComponents' : [],
159168

@@ -279,7 +288,7 @@
279288

280289
'GeometryNodeRealizeInstances' : [
281290
NTPNodeSetting("legacy_behavior", ST.BOOL, min_version = (3, 1, 0),
282-
max_version = (3, 6, 0))
291+
max_version = (4, 0, 0))
283292
],
284293

285294
'GeometryNodeRotateInstances' : [],
@@ -472,12 +481,14 @@
472481
],
473482

474483
'ShaderNodeTexMusgrave' : [
475-
NTPNodeSetting("musgrave_dimensions", ST.ENUM),
476-
NTPNodeSetting("musgrave_type", ST.ENUM)
484+
NTPNodeSetting("musgrave_dimensions", ST.ENUM, max_version = (4, 1, 0)),
485+
NTPNodeSetting("musgrave_type", ST.ENUM, max_version = (4, 1, 0))
477486
],
478487

479488
'ShaderNodeTexNoise' : [
480-
NTPNodeSetting("noise_dimensions", ST.ENUM)
489+
NTPNodeSetting("noise_dimensions", ST.ENUM),
490+
NTPNodeSetting("noise_type", ST.ENUM, min_version=(4, 1, 0)),
491+
NTPNodeSetting("normalize", ST.BOOL, min_version=(4, 0, 0)),
481492
],
482493

483494
'ShaderNodeTexVoronoi' : [
@@ -499,6 +510,16 @@
499510

500511

501512
# UTILITIES
513+
'GeometryNodeIndexSwitch' : [
514+
NTPNodeSetting("data_type", ST.ENUM, min_version = (4, 1, 0)),
515+
NTPNodeSetting("index_switch_items", ST.INDEX_SWITCH_ITEMS, min_version = (4, 1, 0))
516+
],
517+
518+
'GeometryNodeMenuSwitch' : [
519+
NTPNodeSetting("data_type", ST.ENUM, min_version = (4, 1, 0)),
520+
NTPNodeSetting("enum_definition", ST.ENUM_DEFINITION, min_version = (4, 1, 0))
521+
],
522+
502523
'ShaderNodeMix' : [
503524
NTPNodeSetting("blend_type", ST.ENUM, min_version = (3, 4, 0)),
504525
NTPNodeSetting("clamp_factor", ST.BOOL, min_version = (3, 4, 0)),
@@ -610,7 +631,7 @@
610631
],
611632

612633
'FunctionNodeCompareFloats' : [
613-
NTPNodeSetting("operation", ST.ENUM, max_version = (3, 0, 0))
634+
NTPNodeSetting("operation", ST.ENUM, max_version = (3, 2, 0))
614635
],
615636

616637
'ShaderNodeFloatCurve' : [
@@ -641,7 +662,11 @@
641662
'FunctionNodeAxisAngleToRotation' : [],
642663
'FunctionNodeEulerToRotation' : [],
643664
'FunctionNodeInvertRotation' : [],
644-
665+
666+
'FunctionNodeRotateRotation' : [
667+
NTPNodeSetting("rotation_space", ST.ENUM, min_version = (4, 1, 0))
668+
],
669+
645670
'FunctionNodeRotateEuler' : [
646671
NTPNodeSetting("space", ST.ENUM),
647672
NTPNodeSetting("type", ST.ENUM)

material/node_settings.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,14 @@
194194
],
195195

196196
'ShaderNodeTexMusgrave' : [
197-
NTPNodeSetting("musgrave_dimensions", ST.ENUM),
198-
NTPNodeSetting("musgrave_type", ST.ENUM)
197+
NTPNodeSetting("musgrave_dimensions", ST.ENUM, max_version = (4, 1, 0)),
198+
NTPNodeSetting("musgrave_type", ST.ENUM, max_version = (4, 1, 0))
199199
],
200200

201201
'ShaderNodeTexNoise' : [
202202
NTPNodeSetting("noise_dimensions", ST.ENUM),
203-
NTPNodeSetting("normalize", ST.BOOL, min_version = (4, 0, 0))
203+
NTPNodeSetting("noise_type", ST.ENUM, min_version=(4, 1, 0)),
204+
NTPNodeSetting("normalize", ST.BOOL, min_version=(4, 0, 0)),
204205
],
205206

206207
'ShaderNodeTexPointDensity' : [

utils.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ class ST(Enum):
2929
CURVE_MAPPING = auto()
3030
NODE_TREE = auto()
3131

32+
ENUM_DEFINITION = auto() #TODO: unimplemented
33+
INDEX_SWITCH_ITEMS = auto() #TODO: unimplemented
34+
3235
# Asset Library
3336
MATERIAL = auto() # Handle with asset library
3437
OBJECT = auto() # Handle with asset library

0 commit comments

Comments
 (0)