Virtual Fixture FIxes

Author: Liam Sherwin

assets/icons/remove.svg.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b2irkd31agi0x"
-path="res://.godot/imported/Remove.svg-d6b561eec13de9ed9a6b262ecffa42bf.ctex"
+path="res://.godot/imported/remove.svg-4d209cc049dad917abe1dad4ca8edd56.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/icons/Remove.svg"
-dest_files=["res://.godot/imported/Remove.svg-d6b561eec13de9ed9a6b262ecffa42bf.ctex"]
+source_file="res://assets/icons/remove.svg"
+dest_files=["res://.godot/imported/remove.svg-4d209cc049dad917abe1dad4ca8edd56.ctex"]
 
 [params]
 

core/components/fixtures/DMXFixture.gd

@@ -37,19 +37,20 @@ func _component_ready() -> void:
 ## Internal: Sets a parameter to a float value
 func _set_parameter(p_parameter: String, p_function: String, p_value: Variant, p_zone: String) -> void:
 	_raw_layers.get_or_add(p_zone, {})[p_parameter] = {"value": p_value, "function": p_function}
+	parameter_changed.emit(p_parameter, p_function, p_value, p_zone)
 
 
 ## Internal: Erases the parameter on the given layer
 func _erase_parameter(p_parameter: String, p_zone: String) -> void:
 	_raw_layers.get_or_add(p_zone, {}).erace(p_parameter)
+	parameter_erased.emit(p_parameter, p_zone)
+	
 
 
 ## Internal: Sets a parameter override to a float value
 func _set_override(p_parameter: String, p_function: String, p_value: float, p_zone: String = "root") -> void:
 	_raw_override_layers.get_or_add(p_zone, {})[p_parameter] = {"value": p_value, "function": p_function}
 	override_changed.emit(p_parameter, p_function, p_value, p_zone)
-	
-	print(p_function, ": ", p_value)
 
 
 ## Internal: Erases the parameter override 

core/static/Utils.gd

@@ -129,6 +129,16 @@ static func get_htp_color(color_1: Color, color_2: Color) -> Color:
 	return result_color
 
 
+## Blends two colors
+static func blend_color_additive(color_a: Color, color_b: Color) -> Color:
+	return Color(
+		clamp(color_a.r + color_b.r, 0.0, 1.0),
+		clamp(color_a.g + color_b.g, 0.0, 1.0),
+		clamp(color_a.b + color_b.b, 0.0, 1.0),
+		clamp(color_a.a + color_b.a, 0.0, 1.0)
+	)
+
+
 ## Gets the most common variant in an array
 static func get_most_common_value(arr: Array) -> Variant:
 	var count_dict := {}

panels/AddFixture/AddFixture.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=11 format=3 uid="uid://c3lrdtiw05qft"]
 
 [ext_resource type="Theme" uid="uid://cyua45ur0ijqo" path="res://assets/Main.theme" id="1_460tm"]
-[ext_resource type="Script" path="res://panels/AddFixture/AddFixture.gd" id="2_q8wav"]
+[ext_resource type="Script" uid="uid://3asbuxb8omw8" path="res://panels/AddFixture/AddFixture.gd" id="2_q8wav"]
 [ext_resource type="StyleBox" uid="uid://daxhx5qr5qdeu" path="res://assets/styles/SolidPanel.tres" id="2_v2e7d"]
 [ext_resource type="StyleBox" uid="uid://csle20exwqtti" path="res://assets/styles/PanelMenuBar.tres" id="3_oo2yy"]
 [ext_resource type="Texture2D" uid="uid://dpncjre34kf25" path="res://assets/icons/Storage.svg" id="4_7nytk"]
@@ -146,7 +146,7 @@ layout_mode = 2
 size_flags_horizontal = 10
 text = "Select Universe"
 icon = ExtResource("8_85xv7")
-filter = Array[String](["Universe"])
+filter = "Universe"
 
 [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/HSplitContainer/PanelContainer/FixtureInfomation/FixtureInfomation/PanelContainer2/VBoxContainer2"]
 layout_mode = 2

panels/VirtualFixtures/VirtualFixture/VirtualFixture.gd

@@ -36,7 +36,7 @@ var _fixture_signal_connections: Dictionary = {
 	"override_erased": _on_override_value_erased,
 	"all_override_removed": _on_override_value_erased,
 	"parameter_changed": _on_parameter_changed,
-	"parameter_eraced": _on_parameter_eraced,
+	"parameter_erased": _on_parameter_eraced,
 }
 
 
@@ -49,6 +49,7 @@ func set_fixture(control_fixture: Fixture) -> void:
 	if _fixture.has_overrides():
 		$Override.show()
 
+	render_color()
 	$UUID.text = control_fixture.uuid
 
 
@@ -75,14 +76,38 @@ func render_color():
 		base_color.b = parameters["ColorAdd_B"].value
 
 
-	if _fixture.has_parameter("root", "Dimmer") and "Dimmer" in parameters:
-		base_color = base_color * parameters["Dimmer"].value
+	if _fixture.has_parameter("root", "ColorAdd_W") and "ColorAdd_W" in parameters:
+		base_color = Utils.blend_color_additive(base_color, Color.WHITE * parameters["ColorAdd_W"].value)
+	
+	if _fixture.has_parameter("root", "ColorAdd_RY") and "ColorAdd_RY" in parameters:
+		base_color = Utils.blend_color_additive(base_color, Color.ORANGE * parameters["ColorAdd_RY"].value)
+	
+	if _fixture.has_parameter("root", "ColorAdd_UV") and "ColorAdd_UV" in parameters:
+		base_color = Utils.blend_color_additive(base_color, Color.BLUE_VIOLET * parameters["ColorAdd_UV"].value)
+	
+	
+	if _fixture.has_parameter("root", "ColorSub_C") and "ColorSub_C" in parameters:
+		base_color.r -= parameters["ColorSub_C"].value
+	
+	if _fixture.has_parameter("root", "ColorSub_M") and "ColorSub_M" in parameters:
+		base_color.g -= parameters["ColorSub_M"].value
+	
+	if _fixture.has_parameter("root", "ColorSub_Y") and "ColorSub_Y" in parameters:
+		base_color.b -= parameters["ColorSub_Y"].value
+	
+	
+	if _fixture.has_parameter("root", "Dimmer"):
+		if "Dimmer" in parameters:
+			base_color = base_color * parameters["Dimmer"].value
+		else:
+			base_color = Color.BLACK
 
 	set_color(base_color)
 
 
 ## Sets the base color
 func set_color(color: Color) -> void:
+	color.a = 1
 	$Color.modulate = color
 
 

panels/VirtualFixtures/VirtualFixtures.gd

@@ -41,6 +41,18 @@ func _ready() -> void:
 	set_edit_mode_disabled(true)
 
 
+## Zooms in the canvas
+func _zoom_in() -> void:
+	fixture_container.scale += zoom_step
+	#_update_scroll_containers()
+
+
+## Zooms out the canvas
+func _zoom_out() -> void:
+	fixture_container.scale -= zoom_step
+	#_update_scroll_containers()
+
+
 ## Sets edit mode state
 func _edit_mode_toggled(p_edit_mode: bool) -> void:
 	fixture_container.set_edit_mode(edit_mode)
@@ -71,6 +83,7 @@ func _on_selected_fixtures_changed(fixtures: Array) -> void:
 	$TitleBar/HBoxContainer/PanelContainer/HBoxContainer/Import.disabled = fixtures == []
 
 
+## Called when when there is a GUI input on the fixture container
 func _on_fixture_container_gui_input(event: InputEvent) -> void:
 	if event is InputEventMouseMotion and event.button_mask == MOUSE_BUTTON_MASK_MIDDLE:
 		real_scroll.scroll_horizontal -= event.relative.x
@@ -90,15 +103,6 @@ func _on_grid_align_pressed() -> void:
 	$GridAlignSize.show()
 
 
-func _on_zoom_in_pressed() -> void:
-	fixture_container.scale += zoom_step
-	_update_scroll_containers()
-
-
-func _on_zoom_out_pressed() -> void:
-	fixture_container.scale -= zoom_step
-	_update_scroll_containers()
-
 
 ## Saves this VirtualFixture layout into a dict
 func _save() -> Dictionary:
@@ -117,3 +121,7 @@ func _load(saved_data) -> void:
 			if fixture_group is FixtureGroup:
 				fixture_container.set_fixture_group(fixture_group)
 		)
+
+
+func _on_table_gui_input(event: InputEvent) -> void:
+	print(event)

panels/VirtualFixtures/VirtualFixtures.tscn

@@ -108,6 +108,7 @@ script = ExtResource("3_7v2kg")
 _virtual_fixtures_root = NodePath("../../../..")
 
 [node name="Grid" type="ColorRect" parent="Table/RealScroll/ScrollSize/FixtureContainer"]
+visible = false
 material = SubResource("ShaderMaterial_10tdw")
 layout_mode = 1
 anchors_preset = 15
@@ -149,7 +150,6 @@ icon = ExtResource("6_n07cw")
 flat = true
 
 [node name="Zoom Controls" type="PanelContainer" parent="TitleBar/HBoxContainer"]
-visible = false
 layout_mode = 2
 size_flags_vertical = 4
 
@@ -304,8 +304,8 @@ update_on_text_changed = true
 [connection signal="gui_input" from="Table/RealScroll/ScrollSize/FixtureContainer" to="." method="_on_fixture_container_gui_input"]
 [connection signal="gui_input" from="Table/RealScroll/ScrollSize/FixtureContainer" to="Table/RealScroll/ScrollSize/FixtureContainer" method="_on_gui_input"]
 [connection signal="pressed" from="TitleBar/HBoxContainer/FixtureGroupName" to="Table/RealScroll/ScrollSize/FixtureContainer" method="_on_fixture_group_name_pressed"]
-[connection signal="pressed" from="TitleBar/HBoxContainer/Zoom Controls/HBoxContainer/ZoomIn" to="." method="_on_zoom_in_pressed"]
-[connection signal="pressed" from="TitleBar/HBoxContainer/Zoom Controls/HBoxContainer/ZoomOut" to="." method="_on_zoom_out_pressed"]
+[connection signal="pressed" from="TitleBar/HBoxContainer/Zoom Controls/HBoxContainer/ZoomIn" to="." method="_zoom_in"]
+[connection signal="pressed" from="TitleBar/HBoxContainer/Zoom Controls/HBoxContainer/ZoomOut" to="." method="_zoom_out"]
 [connection signal="toggled" from="TitleBar/HBoxContainer/GridControls/HBoxContainer/ShowGrid" to="Table/RealScroll/ScrollSize/FixtureContainer" method="_on_show_grid_toggled"]
 [connection signal="value_changed" from="TitleBar/HBoxContainer/GridControls/HBoxContainer/GridSize" to="Table/RealScroll/ScrollSize/FixtureContainer" method="_on_grid_size_value_changed"]
 [connection signal="pressed" from="TitleBar/HBoxContainer/PanelContainer/HBoxContainer/AddFixtures" to="Table/RealScroll/ScrollSize/FixtureContainer" method="_on_add_fixtures_pressed"]