Art-Net Output From Desk

Author: Liam Sherwin

Main.tscn

@@ -589,7 +589,7 @@ layout_mode = 2
 size_flags_horizontal = 2
 text = "Ip Address"
 
-[node name="Art Net Port" type="LineEdit" parent="TabContainer/Patch Bay/VBoxContainer/HSplitContainer/PanelContainer2/VSplitContainer/PanelContainer/VBoxContainer/GridContainer/PanelContainer2/VBoxContainer/IO Controls/Art-Net/HBoxContainer"]
+[node name="Art Net IP" type="LineEdit" parent="TabContainer/Patch Bay/VBoxContainer/HSplitContainer/PanelContainer2/VSplitContainer/PanelContainer/VBoxContainer/GridContainer/PanelContainer2/VBoxContainer/IO Controls/Art-Net/HBoxContainer"]
 custom_minimum_size = Vector2(145.25, 0)
 layout_mode = 2
 size_flags_horizontal = 10
@@ -683,6 +683,7 @@ text = "Universe  "
 custom_minimum_size = Vector2(200, 0)
 layout_mode = 2
 item_count = 1
+allow_reselect = true
 popup/item_0/text = " "
 popup/item_0/id = 0
 
@@ -943,7 +944,7 @@ script = ExtResource("25_w0caf")
 [connection signal="pressed" from="TabContainer/Patch Bay/VBoxContainer/HSplitContainer/PanelContainer2/VSplitContainer/PanelContainer/VBoxContainer/PanelContainer/Universe Controls/New Output" to="TabContainer/Patch Bay" method="_on_new_output_pressed"]
 [connection signal="pressed" from="TabContainer/Patch Bay/VBoxContainer/HSplitContainer/PanelContainer2/VSplitContainer/PanelContainer/VBoxContainer/PanelContainer/Universe Controls/New Channel Overide" to="TabContainer/Patch Bay" method="_on_new_channel_overide_pressed"]
 [connection signal="item_selected" from="TabContainer/Patch Bay/VBoxContainer/HSplitContainer/PanelContainer2/VSplitContainer/PanelContainer/VBoxContainer/GridContainer/PanelContainer2/VBoxContainer/IO Type" to="TabContainer/Patch Bay" method="_on_io_type_item_selected"]
-[connection signal="text_submitted" from="TabContainer/Patch Bay/VBoxContainer/HSplitContainer/PanelContainer2/VSplitContainer/PanelContainer/VBoxContainer/GridContainer/PanelContainer2/VBoxContainer/IO Controls/Art-Net/HBoxContainer/Art Net Port" to="TabContainer/Patch Bay" method="_on_art_net_port_text_submitted"]
+[connection signal="text_submitted" from="TabContainer/Patch Bay/VBoxContainer/HSplitContainer/PanelContainer2/VSplitContainer/PanelContainer/VBoxContainer/GridContainer/PanelContainer2/VBoxContainer/IO Controls/Art-Net/HBoxContainer/Art Net IP" to="TabContainer/Patch Bay" method="_on_art_net_ip_text_submitted"]
 [connection signal="value_changed" from="TabContainer/Patch Bay/VBoxContainer/HSplitContainer/PanelContainer2/VSplitContainer/PanelContainer/VBoxContainer/GridContainer/PanelContainer2/VBoxContainer/IO Controls/Art-Net/HBoxContainer2/Art Net Port" to="TabContainer/Patch Bay" method="_on_art_net_port_value_changed"]
 [connection signal="value_changed" from="TabContainer/Patch Bay/VBoxContainer/HSplitContainer/PanelContainer2/VSplitContainer/PanelContainer/VBoxContainer/GridContainer/PanelContainer2/VBoxContainer/IO Controls/Art-Net/HBoxContainer3/Art Net Universe" to="TabContainer/Patch Bay" method="_on_art_net_universe_value_changed"]
 [connection signal="item_selected" from="TabContainer/Desk/VSplitContainer/PanelContainer/VBoxContainer/PanelContainer/HBoxContainer/Desk Universe Option" to="TabContainer/Desk" method="_on_desk_universe_option_item_selected"]

Scripts/Classes/Art_net.gd

@@ -2,27 +2,30 @@ extends Node
 class_name ArtNet
 
 var _udp_peer = PacketPeerUDP.new()
-var target_ip = "172.0.0.1"
-var target_port = 6454
 
-var _formatted_dmx_data = []
-var _packet_id = 0
+var art_net = {
+	"ip":"172.0.0.1",
+	"port":6454,
+	"universe":0,
+	"name":"Art-Net Output", 
+	"type":"Art-Net"
+}
 
 func connect_to_host():
 	_udp_peer.close()
-	_udp_peer.connect_to_host(target_ip, target_port)
-
-#func receive(data, _slot):
-	#if typeof(data) != 27: 
-		#return
-	#_formatted_dmx_data = []
-	#for channel in range(1, 513):
-		#_formatted_dmx_data.append(data.dmx_channels.get(channel, 0))
-	#send_artnet_packet(data.universe-1)
-	#print(_formatted_dmx_data)
-	
-func send_packet(universe,dmx_data):
-	print(universe)
+	print(_udp_peer.connect_to_host(art_net.ip, art_net.port))
+
+func _get_name():
+	return art_net.name
+
+func _set_name(name):
+	art_net.name = name
+
+func get_type():
+	return art_net.type
+
+
+func send_packet(dmx_data):
 	print(dmx_data)
 	# Construct Art-Net packet
 	var packet = PackedByteArray()
@@ -44,20 +47,20 @@ func send_packet(universe,dmx_data):
 	packet.append(0)
 
 	# Universe (16-bit)
-	packet.append(universe)
-	packet.append(0)
+	packet.append(art_net.universe % 256)  # Lower 8 bits
+	packet.append(art_net.universe / 256)  # Upper 8 bits
 
 	# Length (16-bit)
 #	packet.append_array([512 % 256, int(512 / 255)])
 	packet.append(02)
 	packet.append(00)
 
 	# DMX Channels
-	for value in dmx_data:
-		packet.append(value)
+	for channel in range(1, 513):
+		packet.append(dmx_data.get(channel, 0))
+		print(dmx_data.get(channel, 0))
 
 	# Send the packet
 #	_udp_peer.set_dest_address(ip, port)
-	print(packet)
-	print(_udp_peer.put_packet(packet))
+	_udp_peer.put_packet(packet)
 

Scripts/Classes/Empty.gd

@@ -0,0 +1,8 @@
+extends Node
+class_name Empty
+
+func _get_name():
+	return "Empty"
+
+func get_type():
+	return "Empty"

Scripts/Classes/Universe.gd

@@ -1,6 +1,10 @@
 extends Node
 class_name Universe
 
+const Art_Net = preload("res://Scripts/Classes/Art_net.gd")
+const Empty = preload("res://Scripts/Classes/Empty.gd")
+
+
 var universe = {
 	"name": "New Universe",
 	"uuid":Globals.new_uuid(),
@@ -9,6 +13,13 @@ var universe = {
 	"inputs": {
 	},
 	"outputs": {
+		
+	},
+	"dmx_data":{
+		
+	},
+	"desk_data":{
+		
 	}
 }
 
@@ -21,10 +32,34 @@ func _get_name():
 func get_uuid():
 	return universe.uuid
 
-func new_input(type):
+func get_all_outputs():
+	return universe.outputs
+
+func get_output(uuid=""):
+	if uuid:
+		return universe.outputs[uuid]
+	return
+
+func new_output(type=""):
 	var uuid = Globals.new_uuid()
+	universe.outputs[uuid] = {}
+	return change_output_type(uuid, type)
+
+func change_output_type(uuid, type):
+	if not type: type == "Empty"
 	match type:
 		"Empty":
-			universe.inputs[uuid] = {}
+			universe.outputs[uuid] = Empty.new()
 		"Art-Net":
-			universe.inputs[uuid] = {}
+			universe.outputs[uuid] = Art_Net.new()
+			universe.outputs[uuid].connect_to_host()
+	return universe.outputs[uuid]
+
+func set_desk_data(dmx_data):
+	universe.desk_data.merge(dmx_data, true)
+	_compile_and_send()
+
+func _compile_and_send():
+	var compiled_dmx_data = universe.desk_data
+	for output in universe.outputs:
+		universe.outputs[output].send_packet(compiled_dmx_data)

Scripts/Desk.gd

@@ -1,11 +1,12 @@
 extends Control
 
-var dmx_data = []
+var dmx_data = {}
 var universe = 1
+
+var current_universe
+
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	dmx_data.resize(512)
-	dmx_data.fill(0)
 
 	for i in range(1, 513):
 		var node_to_add = Globals.components.channel_slider.instantiate()
@@ -18,11 +19,15 @@ func reload_universes():
 	Globals.nodes.desk_universe_option.clear()
 	for universe in Globals.universes:
 		Globals.nodes.desk_universe_option.add_item(Globals.universes[universe].name)
-
+		
+	Globals.nodes.desk_universe_option.select(0)
+	
 func slider_changed(value, channel):
-	dmx_data[channel-1] = value
-	Globals.set_desk_data(universe, dmx_data)
+	dmx_data[channel] = value
+	current_universe.set_desk_data(dmx_data)
+	#Globals.set_desk_data(universe, dmx_data)
 
 
 func _on_desk_universe_option_item_selected(index):
-	universe = index
+	print()
+	current_universe = Globals.universes[Globals.universes.keys()[index]]

Scripts/Global.gd

@@ -200,12 +200,7 @@ func reload_universe_io_connections(io={}):
 		print(universes)
 
 func _ready():
-	art_net_sender.target_ip = "192.168.1.53"
-	art_net_sender.connect_to_host()
-	var dmx = []
-	dmx.resize(512)
-	dmx.fill(255)
-	art_net_sender.send_packet(0, dmx)
+	pass
 
 func new_universe():
 	var new_universe = Universe.new()

Scripts/Patch_bay.gd

@@ -3,6 +3,7 @@ extends Control
 var current_universe_uuid
 var current_io_uuid
 var current_io_type
+var current_io
 
 var input_options = [
 	"Empty",
@@ -39,6 +40,7 @@ func delete_request(node):
 				universes[current_universe_uuid].outputs.erase(node.get_meta("output_uuid"))
 				current_io_uuid = ""
 				current_io_type = ""
+				current_io = ""
 				reload_io()
 
 			).bind(node))
@@ -48,14 +50,15 @@ func edit_request(node):
 	match node.get_meta("type"):
 		"universe":
 			current_universe_uuid = node.get_meta("universe_uuid")
-			Globals.nodes.universe_name.text = universes[current_universe_uuid].name
+			Globals.nodes.universe_name.text = universes[current_universe_uuid].get_name()
 
 			set_universe_controls_enabled(true)
 			reload_io()
 		"output":
 			current_io_uuid = node.get_meta("output_uuid")
 			current_io_type = "output"
-			set_io_controls_enabled(true, universes[current_universe_uuid].outputs[current_io_uuid].type)
+			current_io = universes[current_universe_uuid].get_output(current_io_uuid)
+			set_io_controls_enabled(true, universes[current_universe_uuid].get_output(current_io_uuid).get_type())
 			reload_io()
 
 func on_edit_mode_changed(edit_mode):
@@ -110,45 +113,50 @@ func new_input():
 	Globals.nodes.universe_inputs.add_child(node_to_add)
 
 func new_output():
-	var output_uuid = Globals.new_uuid()
-	
-	universes[current_universe_uuid].outputs[output_uuid] = {
-		"type":"Empty",
-		"name":"Empty Output",
-		"settings":{
-			
-		}
-	}
+	universes[current_universe_uuid].new_output("Empty")
+	#var output_uuid = Globals.new_uuid()
+	#
+	#universes[current_universe_uuid].outputs[output_uuid] = {
+		#"type":"Empty",
+		#"name":"Empty Output",
+		#"settings":{
+			#
+		#}
+	#}
 	reload_io()
 
 func reload_io():
 	if not current_universe_uuid:return
+	
 	for node in Globals.nodes.universe_outputs.get_children():
 		node.queue_free()
-	for uuid in universes[current_universe_uuid].outputs:
-		var output = universes[current_universe_uuid].outputs[uuid]
+		
+	for uuid in universes[current_universe_uuid].get_all_outputs().keys():
+		var output = universes[current_universe_uuid].get_output(uuid)
 		var node_to_add = Globals.components.list_item.instantiate()
-		node_to_add.set_item_name(output.name)
+		print(output)
+		node_to_add.set_item_name(output._get_name())
 		node_to_add.control_node = self
 		node_to_add.set_meta("output_uuid", uuid)
 		node_to_add.set_meta("type", "output")
 		node_to_add.name = uuid
 		node_to_add.set_highlighted(false)
 
 		if current_io_uuid == uuid:
-			if output.type:
-				Globals.nodes.universe_io_type.selected = output_options.find(output.type)
-			node_to_add.set_highlighted(true)
-			if output.type != "Empty":
+			if output.get_type():
+				Globals.nodes.universe_io_type.selected = output_options.find(output.get_type())
+			
+			if output.get_type() != "Empty":
 				for node in Globals.nodes.universe_io_controls.get_children():
-					if node.name == output.type:
+					if node.name == output.get_type():
 						node.visible = true
 					else:
+			
 						node.visible = false
+			node_to_add.set_highlighted(true)
 
 		Globals.nodes.universe_outputs.add_child(node_to_add)
 
-		
 func set_universe_controls_enabled(enabled):
 	for node in Globals.nodes.universe_controls.get_children():
 		if node is LineEdit:
@@ -167,7 +175,6 @@ func set_io_controls_enabled(enabled, type):
 			node.visible = false
 
 
-
 # Button Callbacks
 
 func _on_io_type_item_selected(index):
@@ -177,27 +184,20 @@ func _on_io_type_item_selected(index):
 			set_io_controls_enabled(true, input_options[index])
 
 		elif current_io_type == "output":
-			universes[current_universe_uuid].outputs[current_io_uuid].type = output_options[index]
+			current_io = universes[current_universe_uuid].change_output_type(current_io_uuid, output_options[index])
 			set_io_controls_enabled(true, output_options[index])
-			match output_options[index]:
-				"Art-Net":
-					universes[current_universe_uuid].outputs[current_io_uuid].settings = {
-						"ip":"172.0.0.1",
-						"port":6454,
-						"universe":0
-					}
-				"Empty":
-					universes[current_universe_uuid].outputs[current_io_uuid].settings = {}
 		reload_io()
 
-func _on_art_net_port_text_submitted(new_text):
-	universes[current_universe_uuid].outputs[current_io_uuid].settings.ip = new_text
+func _on_art_net_ip_text_submitted(new_text):
+	current_io.art_net.ip = new_text
+	current_io.connect_to_host()
 
 func _on_art_net_port_value_changed(value):
-	universes[current_universe_uuid].outputs[current_io_uuid].settings.port = value
+	current_io.art_net.port = value
+	current_io.connect_to_host()
 
 func _on_art_net_universe_value_changed(value):
-	universes[current_universe_uuid].outputs[current_io_uuid].settings.universe = value
+	current_io.art_net.universe = int(value)
 
 func _on_new_universe_pressed():
 	new_universe()