OverviewFilesCommitsIssuesDocsReleasesPeers

godot-witchy_world_demo commits / f32c768

menu stuff
f32c7681a3f218ed0a38fe2d4761db43c6f9a34c
by Dresk Spidflisk <dreskspidflisk@gmail.com> · 2022-04-27T03:55:30.000Z

Changed files (3) +31 -7

hypergodot/hyper_gossip/hyper_gossip.gd +3 -0
……@@ -163,6 +163,9 @@ func _get_extension_url():
163163
164164func _get_extension_listen_url():
165165 return url + '$/extensions/'
166
167func _get_url() -> String:
168 return url
166169
167170func _make_id():
168171 return str(randi()) + str(randi())
menu/main/menu_main.gd +28 -7
……@@ -22,7 +22,9 @@ onready var multiplayer_menu = ui.get_node(@"Multiplayer")
2222onready var multiplayer_LabelGWStatus = multiplayer_menu.get_node(@"HyperGatewayStatus").get_node(@"LabelGWStatus")
2323onready var multiplayer_StartGW = multiplayer_menu.get_node(@"Gateway").get_node(@"Start")
2424onready var multiplayer_StopGW = multiplayer_menu.get_node(@"Gateway").get_node(@"Stop")
25onready var multiplayer_LabelGossipStatus = multiplayer_menu.get_node(@"HyperGossipStatus").get_node(@"LabelGossipStatus")
2526onready var multiplayer_PortInput = multiplayer_menu.get_node(@"HyperGatewayPort").get_node(@"LineEdit")
27onready var multiplayer_GossipURLInput = multiplayer_menu.get_node(@"GossipURL").get_node(@"LineEdit")
2628
2729onready var gi_menu = settings_menu.get_node(@"GI")
2830onready var gi_high = gi_menu.get_node(@"High")
……@@ -40,11 +42,13 @@ onready var bloom_high = bloom_menu.get_node(@"High")
4042onready var bloom_low = bloom_menu.get_node(@"Low")
4143onready var bloom_disabled = bloom_menu.get_node(@"Disabled")
4244
43var hyperGatewayNode = null
44var hyperGatewayURL : String = ""
45var hyperGatewayNode : HyperGateway = null
4546var hyperGatewayPID : int = 0
4647var hyperGatewayPort : int = 0
4748
49var hyperGossipNode : HyperGossip = null
50var hyperGossipURL : String = ""
51
4852var hyperGWPortInputBackup : String = ""
4953
5054func _ready():
……@@ -108,8 +112,9 @@ func _on_Settings_pressed():
108112 bloom_disabled.pressed = true
109113
110114func _UpdateHyperGatewayInfo():
111 multiplayer_StartGW.disabled = true
115 multiplayer_StartGW.disabled = false
112116 multiplayer_StopGW.disabled = true
117 multiplayer_LabelGWStatus.text = "Not Running"
113118
114119 if(hyperGatewayNode != null):
115120 if(hyperGatewayNode is HyperGateway):
……@@ -118,10 +123,17 @@ func _UpdateHyperGatewayInfo():
118123
119124 if( hyperGatewayNode.getIsGatewayRunning() ):
120125 multiplayer_StopGW.disabled = false
126 multiplayer_StartGW.disabled = true
121127 multiplayer_LabelGWStatus.text = "Running (PID " + str(hyperGatewayPID) + ") on Port " + str(hyperGatewayPort)
122 else:
123 multiplayer_StartGW.disabled = false
124 multiplayer_LabelGWStatus.text = "Not Running"
128
129func _UpdateHyperGossipInfo():
130 multiplayer_LabelGossipStatus.text = "N/A"
131 if(hyperGossipNode != null):
132 if(hyperGossipNode is HyperGossip):
133 if( hyperGatewayNode.getIsGatewayRunning() ):
134 hyperGossipURL = hyperGossipNode._get_url()
135 multiplayer_LabelGossipStatus.text = hyperGossipURL
136
125137
126138func _on_Multiplayer_pressed():
127139 main.hide()
……@@ -129,6 +141,11 @@ func _on_Multiplayer_pressed():
129141 if(hyperGatewayNode == null):
130142 hyperGatewayNode = get_tree().get_current_scene().find_node("HyperGateway")
131143 _UpdateHyperGatewayInfo()
144 # Check for HyperGossip Node
145 if(hyperGossipNode == null):
146 hyperGossipNode = get_tree().get_current_scene().find_node("HyperGossip")
147 _UpdateHyperGossipInfo()
148
132149
133150 multiplayer_menu.show()
134151
……@@ -182,18 +199,22 @@ func _on_Multiplayer_Apply_pressed():
182199
183200
184201func _on_Start_pressed():
202 hyperGatewayNode.port = multiplayer_PortInput.text
203 hyperGossipNode.url = multiplayer_GossipURLInput.text
185204 hyperGatewayNode.start()
186205 _UpdateHyperGatewayInfo()
206 _UpdateHyperGossipInfo()
187207
188208
189209func _on_Stop_pressed():
190210 hyperGatewayNode.stop()
191211 multiplayer_PortInput
192212 _UpdateHyperGatewayInfo()
213 _UpdateHyperGossipInfo()
193214
194215
195216func _on_HyperGWPort_LineEdit_text_changed(new_text : String):
196 if(new_text.length() < 1 or new_text.is_valid_integer()):
217 if(new_text.length() < 1 or new_text.is_valid_integer() or new_text.to_int() > 65535):
197218 hyperGWPortInputBackup = new_text
198219 else:
199220 multiplayer_PortInput.text = hyperGWPortInputBackup
menu/main/menu_main.scn +0 -0
(no content changes — binary or rename)