Merge pull request #979 from CodeFHD/for_v2.10

CodeFHD · web-flow · commit 7ba0f007d0fe · 2025-03-05T19:14:13.000+01:00
Reactivate some previous commits
diff --git a/export/caches/object_cache.py b/export/caches/object_cache.py
@@ -482,7 +482,6 @@ def _convert_mesh_obj(self, exporter, dg_obj_instance, obj, obj_key, depsgraph,
             for idx, (shape_name, mat_index) in enumerate(exported_mesh.mesh_definitions):
                 shape = shape_name
                 lux_mat_name, mat_props, node_tree = export_material(obj, mat_index, exporter, depsgraph, is_viewport_render)
-                print(lux_mat_name)
                 scene_props.Set(mat_props)
                 mat_names.append(lux_mat_name)
 
diff --git a/export/hair.py b/export/hair.py
@@ -120,8 +120,8 @@ def convert_hair(exporter, obj, obj_key, psys, depsgraph, luxcore_scene, scene_p
             start = 0
         else:
             # Number of virtual parents reduces the number of exported children
-            num_virtual_parents = math.trunc(0.3 * psys.settings.virtual_parents
-                                             * psys.settings.child_percent * num_parents)
+            num_virtual_parents = math.trunc(
+                0.3 * psys.settings.virtual_parents * len(psys.child_particles) * num_parents)
             start = num_parents + num_virtual_parents
 
         # Collect point/color/uv information from Blender
@@ -257,16 +257,13 @@ def convert_hair_curves(exporter, depsgraph, obj, obj_key, luxcore_scene, is_for
 
     strands = obj.data.curves
 
-    max_strand_length = 0
-    for strand in strands:
-        if strand.points_length > max_strand_length:
-            max_strand_length = strand.points_length
+    points_per_strand = np.fromiter((strand.points_length
+                  for strand in strands), dtype=np.int32)
 
     points = np.fromiter((elem
                   for strand in strands
-                  for idx in range(0, max_strand_length)
-                  for elem in get_strand_seg(idx, strand)),
-                 dtype=np.float32)
+                  for idx in range(strand.points_length)
+                  for elem in strand.points[idx].position), dtype=np.float32)
 
     colors = np.empty(shape=0, dtype=np.float32)
     uvs = np.empty(shape=0, dtype=np.float32)
@@ -283,8 +280,6 @@ def convert_hair_curves(exporter, depsgraph, obj, obj_key, luxcore_scene, is_for
     uvs_needed = settings.copy_uv_coords
     copy_uvs = settings.copy_uv_coords
 
-    uvs_needed = False
-
     if export_color != "none" or uvs_needed:
         emitter_mesh = obj.parent.to_mesh(depsgraph=depsgraph)
         vertex_colors = emitter_mesh.vertex_colors
@@ -306,13 +301,11 @@ def convert_hair_curves(exporter, depsgraph, obj, obj_key, luxcore_scene, is_for
                            for elem in uv_coord.vector),
                           dtype=np.float32)
 
-
     if len(uvs) == 0:
         copy_uvs = False
 
     transformation = None
-
-    success = luxcore_scene.DefineBlenderStrands(lux_shape_name, max_strand_length,
+    success = luxcore_scene.DefineBlenderCurveStrands(lux_shape_name, points_per_strand,
                                                  points, colors, uvs, image_filename, settings.gamma,
                                                  copy_uvs, transformation, strand_diameter,
                                                  root_width, tip_width, width_offset,
diff --git a/nodes/__init__.py b/nodes/__init__.py
@@ -50,6 +50,7 @@
     sockets.LuxCoreSocketFloat0to1,
     sockets.LuxCoreSocketFloat0to2,
     sockets.LuxCoreSocketBumpHeight,
+    sockets.LuxCoreSocketFloatDisneySheen,
     sockets.LuxCoreSocketVector,
     sockets.LuxCoreSocketRoughness,
     sockets.LuxCoreSocketIOR,
diff --git a/nodes/materials/disney.py b/nodes/materials/disney.py
@@ -25,7 +25,7 @@ def init(self, context):
         self.add_input("LuxCoreSocketFloat0to1", "Specular Tint", 0)
         self.add_input("LuxCoreSocketFloat0to1", "Roughness", 0.2)
         self.add_input("LuxCoreSocketFloat0to1", "Anisotropic", 0)
-        self.add_input("LuxCoreSocketFloatPositive", "Sheen", 0)
+        self.add_input("LuxCoreSocketFloatDisneySheen", "Sheen", 0)
         self.add_input("LuxCoreSocketFloat0to1", "Sheen Tint", 0)
         self.add_input("LuxCoreSocketFloat0to1", "Clearcoat", 0)
         self.add_input("LuxCoreSocketFloat0to1", "Clearcoat Gloss", 1)
diff --git a/nodes/materials/glass.py b/nodes/materials/glass.py
@@ -77,11 +77,11 @@ def init(self, context):
         ThinFilmCoating.init(self)
         
         Roughness.init(self, default=0.05, init_enabled=False)
-        Roughness.update_anisotropy(self, context)
 
         self.add_common_inputs()
 
         self.outputs.new("LuxCoreSocketMaterial", "Material")
+        Roughness.update_anisotropy(self, context)
         
 
     def draw_buttons(self, context, layout):
diff --git a/nodes/materials/glossy2.py b/nodes/materials/glossy2.py
@@ -18,11 +18,14 @@ def update_use_ior(self, context):
             self.inputs[id].enabled = not self.use_ior
         utils_node.force_viewport_update(self, context)
 
-    multibounce: BoolProperty(update=utils_node.force_viewport_update, name="Multibounce", default=False,
+    multibounce: BoolProperty(update=utils_node.force_viewport_update,
+                              name="Multibounce",
+                              default=False,
                               description=MULTIBOUNCE_DESCRIPTION)
-    use_ior: BoolProperty(name="Use IOR", default=False,
-                           update=update_use_ior,
-                           description=IOR_DESCRIPTION)
+    use_ior: BoolProperty(name="Use IOR",
+                          default=False,
+                          update=update_use_ior,
+                          description=IOR_DESCRIPTION)
     use_anisotropy: BoolProperty(name=Roughness.aniso_name,
                                   default=False,
                                   description=Roughness.aniso_desc,
diff --git a/nodes/materials/metal.py b/nodes/materials/metal.py
@@ -46,7 +46,7 @@ def change_input_type(self, context):
     def init(self, context):
         self.add_input("LuxCoreSocketColor", "Color", (0.7, 0.7, 0.7))
         self.inputs.new("LuxCoreSocketFresnel", "Fresnel")
-        self.inputs["Fresnel"].enabled = False        
+        self.inputs["Fresnel"].enabled = False
         Roughness.init(self, 0.05)
         
         self.add_common_inputs()
diff --git a/nodes/sockets.py b/nodes/sockets.py
@@ -212,6 +212,13 @@ class LuxCoreSocketBumpHeight(bpy.types.NodeSocket, LuxCoreSocketFloat):
                                  precision=FLOAT_UI_PRECISION)
 
 
+class LuxCoreSocketFloatDisneySheen(bpy.types.NodeSocket, LuxCoreSocketFloat):
+    default_value: FloatProperty(min=0, max=100, soft_max=10.0, description="Sheen value",
+                                 update=utils_node.force_viewport_update,
+                                 precision=FLOAT_UI_PRECISION)
+    slider = True
+
+
 class LuxCoreSocketVector(bpy.types.NodeSocket, LuxCoreNodeSocket):
     color = Color.vector_texture
     default_value: FloatVectorProperty(name="", subtype="XYZ",
diff --git a/nodes/textures/__init__.py b/nodes/textures/__init__.py
@@ -66,6 +66,7 @@
     smoke.LuxCoreNodeTexSmoke,
     splitfloat3.LuxCoreNodeTexSplitFloat3,
     timeinfo.LuxCoreNodeTexTimeInfo,
+    tree.LuxCoreTextureNodeTree,
     triplanar.LuxCoreNodeTexTriplanar,
     triplanar_bump.LuxCoreNodeTexTriplanarBump,
     triplanar_normalmap.LuxCoreNodeTexTriplanarNormalmap,
diff --git a/nodes/textures/colormix.py b/nodes/textures/colormix.py
@@ -21,17 +21,19 @@ class LuxCoreNodeTexColorMix(LuxCoreNodeTexture, bpy.types.Node):
     ]
 
     def change_mode(self, context):
+        id = self.inputs.find("Color 2")
         if self.mode in {"clamp", "abs"}:
             self.inputs[1].name = "Color"
-            self.inputs["Color 2"].enabled = False
+            self.inputs[id].enabled = False
         else:
             self.inputs[1].name = "Color 1"
-            self.inputs["Color 2"].enabled = True
+            self.inputs[id].enabled = True
         
+        id = self.inputs.find("Fac")
         if self.mode == "mix":
-            self.inputs["Fac"].enabled = True
+            self.inputs[id].enabled = True
         else:
-            self.inputs["Fac"].enabled = False
+            self.inputs[id].enabled = False
         utils_node.force_viewport_update(self, context)
 
     mode: EnumProperty(name="Mode", items=mode_items, default="mix", update=change_mode)
diff --git a/nodes/textures/hitpoint.py b/nodes/textures/hitpoint.py
@@ -10,8 +10,10 @@ class LuxCoreNodeTexHitpoint(LuxCoreNodeTexture, bpy.types.Node):
     bl_width_default = 150
 
     def change_mode(self, context):
-        value_output = self.outputs["Value"]
-        color_output = self.outputs["Color"]
+        id = self.outputs.find("Value")
+        value_output = self.outputs[id]
+        id = self.outputs.find("Color")
+        color_output = self.outputs[id]
         was_value_enabled = value_output.enabled
 
         color_output.enabled = self.mode == "hitpointcolor"
diff --git a/nodes/textures/mapping2d.py b/nodes/textures/mapping2d.py
@@ -22,7 +22,8 @@ def update_uniform_scale(self, context):
         utils_node.force_viewport_update(self, context)
 
     def update_mapping_type(self, context):
-        self.inputs["2D Mapping (optional)"].enabled = self.mapping_type == "uvmapping2d"
+        id = self.inputs.find("2D Mapping (optional)")
+        self.inputs[id].enabled = self.mapping_type == "uvmapping2d"
         if self.mapping_type == "uvrandommapping2d" and self.seed_type == "mesh_islands":
             utils_node.force_viewport_mesh_update(self, context)
         else:
diff --git a/nodes/textures/mapping3d.py b/nodes/textures/mapping3d.py
@@ -22,7 +22,8 @@ def update_uvmap(self, context):
             utils_node.force_viewport_update(self, context)
 
     def update_mapping_type(self, context):
-        self.inputs["3D Mapping (optional)"].enabled = self.mapping_type != "localrandommapping3d"
+        id = self.inputs.find("3D Mapping (optional)")
+        self.inputs[id].enabled = self.mapping_type != "localrandommapping3d"
         if self.mapping_type == "localrandommapping3d" and self.seed_type == "mesh_islands":
             utils_node.force_viewport_mesh_update(self, context)
         else:
diff --git a/nodes/textures/objectid.py b/nodes/textures/objectid.py
@@ -9,8 +9,10 @@ class LuxCoreNodeTexObjectID(LuxCoreNodeTexture, bpy.types.Node):
     bl_width_default = 150
 
     def change_mode(self, context):
-        value_output = self.outputs["Value"]
-        color_output = self.outputs["Color"]
+        id = self.outputs.find("Value")
+        value_output = self.outputs[id]
+        id = self.outputs.find("Color")
+        color_output = self.outputs[id]
         was_value_enabled = value_output.enabled
 
         color_output.enabled = self.mode == "objectidcolor"
diff --git a/nodes/textures/triplanar.py b/nodes/textures/triplanar.py
@@ -13,9 +13,10 @@ def update_multiple_textures(self, context):
             self.inputs["Color"].name = "Color X"
         else:
             self.inputs["Color X"].name = "Color"
-
-        self.inputs["Color Y"].enabled = self.multiple_textures
-        self.inputs["Color Z"].enabled = self.multiple_textures
+        id = self.inputs.find("Color Y")
+        self.inputs[id].enabled = self.multiple_textures
+        id = self.inputs.find("Color Z")
+        self.inputs[id].enabled = self.multiple_textures
         utils_node.force_viewport_update(self, context)
 
     multiple_textures: BoolProperty(update=update_multiple_textures, name="Multiple Textures", default=False,
diff --git a/nodes/textures/triplanar_bump.py b/nodes/textures/triplanar_bump.py
@@ -18,10 +18,15 @@ def update_multiple_textures(self, context):
             self.inputs["Value X"].name = "Value"
             self.inputs["Bump Height X"].name = "Bump Height"
 
-        self.inputs["Value Y"].enabled = self.multiple_textures
-        self.inputs["Bump Height Y"].enabled = self.multiple_textures
-        self.inputs["Value Z"].enabled = self.multiple_textures
-        self.inputs["Bump Height Z"].enabled = self.multiple_textures
+        id = self.inputs.find("Value Y")
+        self.inputs[id].enabled = self.multiple_textures
+        id = self.inputs.find("Bump Height Y")
+        self.inputs[id].enabled = self.multiple_textures
+        id = self.inputs.find("Value Z")
+        self.inputs[id].enabled = self.multiple_textures
+        id = self.inputs.find("Bump Height Z")
+        self.inputs[id].enabled = self.multiple_textures
+        
         utils_node.force_viewport_update(self, context)
 
     multiple_textures: BoolProperty(update=update_multiple_textures, name="Multiple Textures", default=False,
diff --git a/nodes/textures/triplanar_normalmap.py b/nodes/textures/triplanar_normalmap.py
@@ -12,12 +12,17 @@ class LuxCoreNodeTexTriplanarNormalmap(LuxCoreNodeTexture, bpy.types.Node):
 
     def update_multiple_textures(self, context):
         if self.multiple_textures:
-            self.inputs["Color"].name = "Color X"
+            id = self.inputs.find("Color")
+            self.inputs[id].name = "Color X"
         else:
-            self.inputs["Color X"].name = "Color"
+            id = self.inputs.find("Color X")
+            self.inputs[id].name = "Color"
 
-        self.inputs["Color Y"].enabled = self.multiple_textures
-        self.inputs["Color Z"].enabled = self.multiple_textures
+        self.inputs[id].name = "Color Y"
+        self.inputs[id].enabled = self.multiple_textures
+        self.inputs[id].name = "Color Y"
+        self.inputs[id].enabled = self.multiple_textures
+        
         utils_node.force_viewport_update(self, context)
 
     multiple_textures: BoolProperty(update=update_multiple_textures, name="Multiple Textures", default=False,
diff --git a/nodes/textures/vectormath.py b/nodes/textures/vectormath.py
@@ -20,17 +20,19 @@ class LuxCoreNodeTexVectorMath(LuxCoreNodeTexture, bpy.types.Node):
     ]
 
     def change_mode(self, context):
+        id = self.inputs.find("Vector 2")
         if self.mode in {"clamp", "abs"}:
             self.inputs[1].name = "Vector"
-            self.inputs["Vector 2"].enabled = False
+            self.inputs[id].enabled = False
         else:
             self.inputs[1].name = "Vector 1"
-            self.inputs["Vector 2"].enabled = True
+            self.inputs[id].enabled = True
         
+        id = self.inputs.find("Fac")
         if self.mode == "mix":
-            self.inputs["Fac"].enabled = True
+            self.inputs[id].enabled = True
         else:
-            self.inputs["Fac"].enabled = False
+            self.inputs[id].enabled = False
 
         utils_node.force_viewport_update(self, context)
 
diff --git a/operators/general.py b/operators/general.py
@@ -154,7 +154,8 @@ def execute(self, context):
                 output = out.name
                 break
 
-        node_tree.links.new(new_node.outputs[output], node.inputs[self.input_socket])
+        output_id = node.outputs.find("output")
+        node_tree.links.new(new_node.outputs[output_id], node.inputs[self.input_socket])
 
         # Special stuff only needed by material output
         if self.socket_type == "LuxCoreSocketVolume" and self.node_type == "LuxCoreNodeTreePointer":
diff --git a/operators/lightgroups.py b/operators/lightgroups.py
@@ -92,13 +92,13 @@ def create_editor():
 
     input_node = editor.nodes.new("NodeGroupInput")
     output_node = editor.nodes.new("NodeGroupOutput")
-    editor.inputs.new("NodeSocketColor", "Light Group")
-    gain = editor.inputs.new("NodeSocketFloat", "Gain")
+    editor.interface.new_socket(socket_type="NodeSocketColor", name="Light Group", in_out="INPUT")
+    gain = editor.interface.new_socket(socket_type="NodeSocketFloat", name="Gain", in_out="INPUT")
     gain.default_value = 1
     gain.min_value = 0
-    color = editor.inputs.new("NodeSocketColor", "Color")
+    color = editor.interface.new_socket(socket_type="NodeSocketColor", name="Color", in_out="INPUT")
     color.default_value = (1, 1, 1, 1)
-    editor.outputs.new("NodeSocketColor", "Image")
+    editor.interface.new_socket(socket_type="NodeSocketColor", name="Image", in_out="OUTPUT")
 
     multiply_color = editor.nodes.new("CompositorNodeMixRGB")
     multiply_color.blend_type = "MULTIPLY"
@@ -136,10 +136,10 @@ def create_mixer(editor):
 
     input_node = mixer.nodes.new("NodeGroupInput")
     output_node = mixer.nodes.new("NodeGroupOutput")
-    mixer.inputs.new("NodeSocketColor", "ALBEDO")
-    mixer.inputs.new("NodeSocketVector", "AVG_SHADING_NORMAL")
-    mixer.outputs.new("NodeSocketColor", "Denoised Image")
-    mixer.outputs.new("NodeSocketColor", "Noisy Image")
+    mixer.interface.new_socket(socket_type="NodeSocketColor", name="ALBEDO", in_out="INPUT")
+    mixer.interface.new_socket(socket_type="NodeSocketVector", name="AVG_SHADING_NORMAL", in_out="INPUT")
+    mixer.interface.new_socket(socket_type="NodeSocketColor", name="Denoised Image", in_out="OUTPUT")
+    mixer.interface.new_socket(socket_type="NodeSocketColor", name="Noisy Image", in_out="OUTPUT")
 
     input_node.location = (-750, -110)
     output_node.location = (1455, -930)
@@ -153,14 +153,14 @@ def create_mixer(editor):
     for i in range(MAX_LIGHTGROUPS):
         input_index_offset = MIXER_SOCKET_INDEX_START + i * MIXER_SOCKET_INDEX_STEP
         # Light Group i
-        mixer.inputs.new("NodeSocketColor", f"Light Group {i + 1}")
+        mixer.interface.new_socket(socket_type="NodeSocketColor", name=f"Light Group {i + 1}", in_out="INPUT")
         light_group_input = input_node.outputs[input_index_offset]
         # Gain
-        gain = mixer.inputs.new("NodeSocketFloat", "Gain")
+        gain = mixer.interface.new_socket(socket_type="NodeSocketFloat", name="Gain", in_out="INPUT")
         gain.default_value = 1
         gain.min_value = 0
         # Color
-        color = mixer.inputs.new("NodeSocketColor", "Color")
+        color = mixer.interface.new_socket(socket_type="NodeSocketColor", name="Color", in_out="INPUT")
         color.default_value = (1, 1, 1, 1)
 
         editor_instance = mixer.nodes.new("CompositorNodeGroup")
diff --git a/utils/node.py b/utils/node.py
@@ -80,6 +80,9 @@ def get_link(socket):
 
     if not socket.is_linked:
         return None
+    
+    if len(socket.links) < 1:
+        return None
 
     link = socket.links[0]
 
