Feat: Luminance Mask

Author: Sightskeye

OmniscientImporter/cameraProjection/cameraProjectionMaterial.py

@@ -124,9 +124,6 @@ def add_driver_for_multiply(node, collection_index, shot_index, data_path):
         value_node.outputs[0].default_value = 1.0
         value_node.name = "ValueEmissionNode"
 
-        if collection:
-            add_driver(value_node, 0, bpy.context.scene, 'SCENE', f"Omni_Collections[{collection_index}].emission_value", True)
-
         multiply_emission_node = nodes.new("ShaderNodeMath")
         multiply_emission_node.location = (400.0, bsdf_vertical_position - 500)
         multiply_emission_node.operation = 'MULTIPLY'
@@ -137,10 +134,14 @@ def add_driver_for_multiply(node, collection_index, shot_index, data_path):
         mix_rgb_emission_node.hide = True
         mix_rgb_emission_node.name = "MixRGBEmissionNode"
 
+        if collection:
+            add_driver(value_node, 0, bpy.context.scene, 'SCENE', f"Omni_Collections[{collection_index}].emission_value", True)
+            add_driver(mix_rgb_emission_node, 0, bpy.context.scene, 'SCENE', f"Omni_Collections[{collection_index}].mix_rgb_emission_input")
+
         create_link(material.node_tree, color_ramp_emission_node, 0, multiply_emission_node, 0)
         create_link(material.node_tree, value_node, 0, multiply_emission_node, 1)
-        create_link(material.node_tree, multiply_emission_node, 0, mix_rgb_emission_node, 1)
-        create_link(material.node_tree, value_node, 0, mix_rgb_emission_node, 2)
+        create_link(material.node_tree, multiply_emission_node, 0, mix_rgb_emission_node, 2)
+        create_link(material.node_tree, value_node, 0, mix_rgb_emission_node, 1)
     else:
         # Update positions if nodes already exist
         color_ramp_emission_node = find_node(nodes, 'VALTORGB', 'ColorRampEmissionNode')

OmniscientImporter/ui/omniPanel.py

@@ -47,6 +47,7 @@ class OmniCollection(PropertyGroup):
     expanded: bpy.props.BoolProperty(name="Expanded", default=False)
     emission_value: bpy.props.FloatProperty(name="Emission Value", default=0.0, min=0.0, max=1000.0)
     color_scan: bpy.props.FloatVectorProperty(name="Color scan", subtype='COLOR', min=0.0, max=1.0, default=(0.18, 0.18, 0.18))
+    mix_rgb_emission_input: bpy.props.FloatProperty(name="Mix RGB Emission Input", default=0.0, min=0.0, max=1.0)
 
 # -------------------------------------------------------------------
 # Handlers
@@ -173,8 +174,12 @@ def draw(self, context):
             collection = scene.Omni_Collections[collection_index]
             layout.template_list("OMNI_UL_ShotList", "", collection, "shots", scene, "Selected_Shot_Index")
 
-            layout.prop(collection, "emission_value", text="Emission")
-            layout.prop(collection, "color_scan", text="Color Scan")
+            box = layout.box()
+            box.label(text="Scan")
+            box.prop(collection, "emission_value", text="Emission")
+            if collection.emission_value > 0:
+                box.prop(collection, "mix_rgb_emission_input", text="Luminance Mask")
+            box.prop(collection, "color_scan", text="Default Color")
         else:
             layout.label(text="No shots imported")