f7c7bdc · godot-marble_madness_demo

Changed files (12) +419 -9

hypergodot/hyper_gateway/hyper_gateway.gd +16 -2

…	…	@@ -16,7 +16,7 @@ signal finished_download(version)
16	16	export var writable: bool = true
17	17	export var persist: bool = true
18	18
19		export var autoStart: bool = true
	19	export var autoStart: bool = false
20	20	export var autoDownload: bool = true
21	21	export var autoUpdate: bool = false
22	22
…	…	@@ -87,6 +87,8 @@ func setupGateway():
87	87	if !persist: args.append('--no-persist')
88	88	if writable: args.append('--writable')
89	89
	90	args.append("--silent")
	91
90	92	if port != DEFAULT_PORT:
91	93	args.append('--port')
92	94	args.append(String(port))
…	…	@@ -116,10 +118,22 @@ func getIsGatewayRunning() -> bool:
116	118	return true;
117	119	else:
118	120	return false;
	121
	122	func getGatewayPort() -> int:
	123	if( getIsGatewayRunning() ):
	124	return port
	125	else:
	126	return -1;
	127
	128	func getGatewayPID() -> int:
	129	if( getIsGatewayRunning() ):
	130	return processPID;
	131	else:
	132	return 0
119	133
120	134	func getExecutibleName():
121	135	var name = OS.get_name()
122		if name == 'X11': return "hyper-gateway-linux"
	136	if name == 'X11' or name == 'Linux': return "hyper-gateway-linux"
123	137	if name == 'OSX': return "hyper-gateway-macos"
124	138	if name == 'Windows': return "hyper-gateway-windows.exe"
125	139	push_error("Can not start gateway, invalid operating system " + name)

hypergodot/hyper_gossip/hyper_gossip.gd +14 -4

…	…	@@ -13,6 +13,8 @@ export var extension_name = "hyper-gossip-v1"
13	13	export var pool_size = 8
14	14	export var queue_warning_size = 8
15	15
	16	var hyperGateway : HyperGateway
	17
16	18	var peerListRequest = HyperRequest.new()
17	19	var eventSource = HyperEventSource.new()
18	20
…	…	@@ -31,7 +33,7 @@ func _ready():
31	33	peerListRequest.connect("request_completed", self, "_on_peer_list")
32	34	peerListRequest.use_threads = true
33	35
34		for i in range(pool_size):
	36	for _i in range(pool_size):
35	37	var broadcastRequest = HyperRequest.new()
36	38	broadcastRequest.use_threads = true
37	39	add_child(broadcastRequest)
…	…	@@ -79,9 +81,14 @@ func rebroadcast(event):
79	81	_enqueue_broadcast_request(reqURL, body)
80	82
81	83	func broadcast_event(type: String, data):
82		var reqURL = _get_extension_url()
83		var body = JSON.print(_generateEvent(type, data))
84		_enqueue_broadcast_request(reqURL, body)
	84	if(hyperGateway == null):
	85	# TODO : Make the link to HyperGateway static
	86	hyperGateway = get_tree().get_current_scene().get_node("HyperGodot").get_node("HyperGateway")
	87	if(hyperGateway != null):
	88	if( hyperGateway.getIsGatewayRunning() ):
	89	var reqURL = _get_extension_url()
	90	var body = JSON.print(_generateEvent(type, data))
	91	_enqueue_broadcast_request(reqURL, body)
85	92
86	93	func send_to_peer(peer, type, data):
87	94	var reqURL = _get_extension_url_to_peer(peer)
…	…	@@ -156,6 +163,9 @@ func _get_extension_url():
156	163
157	164	func _get_extension_listen_url():
158	165	return url + '$/extensions/'
	166
	167	func _get_url() -> String:
	168	return url
159	169
160	170	func _make_id():
161	171	return str(randi()) + str(randi())

levels/scenes/level_0.tscn +9 -2

…	…	@@ -1,4 +1,4 @@
1		[gd_scene load_steps=15 format=2]
	1	[gd_scene load_steps=16 format=2]
2	2
3	3	[ext_resource path="res://assets/levels/level0/assets_level_0.tscn" type="PackedScene" id=1]
4	4	[ext_resource path="res://levels/spawn_point/spawn_point.tscn" type="PackedScene" id=2]
…	…	@@ -13,11 +13,16 @@
13	13	[ext_resource path="res://hypergodot/hyper_gossip/hyper_gossip.gd" type="Script" id=11]
14	14	[ext_resource path="res://ui/debug/hypercore/ui_debug_hypercore.tscn" type="PackedScene" id=12]
15	15	[ext_resource path="res://ui/PlayerConfig.tscn" type="PackedScene" id=13]
	16	[ext_resource path="res://menu/main/menu_main.scn" type="PackedScene" id=14]
16	17	[ext_resource path="res://player/ball/player_ball_controller.gd" type="Script" id=15]
17	18
18	19	[node name="Spatial" type="Node"]
19	20	script = ExtResource( 3 )
20	21
	22	[node name="UI" type="Node" parent="."]
	23
	24	[node name="Menu_Main" parent="UI" instance=ExtResource( 14 )]
	25
21	26	[node name="level_0" parent="." instance=ExtResource( 1 )]
22	27	transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.178, 1.877, -3.673 )
23	28
…	…	@@ -50,10 +55,13 @@ pause_mode = 2
50	55	script = ExtResource( 5 )
51	56
52	57	[node name="PlayerConfigUI" parent="." instance=ExtResource( 13 )]
	58	visible = false
53	59
54	60	[node name="BallDebugUI" parent="." instance=ExtResource( 6 )]
	61	visible = false
55	62
56	63	[node name="HyperGodotDebugUI" parent="." instance=ExtResource( 12 )]
	64	visible = false
57	65
58	66	[node name="CameraTween" type="Tween" parent="."]
59	67	pause_mode = 2
…	…	@@ -62,7 +70,6 @@ pause_mode = 2
62	70
63	71	[node name="HyperGateway" type="Node" parent="HyperGodot"]
64	72	script = ExtResource( 10 )
65		autoStart = false
66	73
67	74	[node name="HyperGossip" type="Node" parent="HyperGodot"]
68	75	script = ExtResource( 11 )

menu/main/buttongroup_1.tres +3 -0

…	…	@@ -0,0 +1,3 @@
	1	[gd_resource type="ButtonGroup" format=2]
	2
	3	[resource]

menu/main/buttongroup_2.tres +3 -0

…	…	@@ -0,0 +1,3 @@
	1	[gd_resource type="ButtonGroup" format=2]
	2
	3	[resource]

menu/main/buttongroup_3.tres +3 -0

…	…	@@ -0,0 +1,3 @@
	1	[gd_resource type="ButtonGroup" format=2]
	2
	3	[resource]

menu/main/menu_main.gd +268 -0

…	…	@@ -0,0 +1,268 @@
	1	extends Node
	2
	3	var res_loader: ResourceInteractiveLoader = null
	4	var loading_thread: Thread = null
	5
	6	signal replace_main_scene
	7	#warning-ignore:unused_signal
	8	signal quit # Useless, but needed as there is no clean way to check if a node exposes a signal
	9
	10	onready var ui = $Menu_Main
	11	onready var main = ui.get_node(@"Main")
	12	onready var play_button = main.get_node(@"Resume")
	13	onready var settings_button = main.get_node(@"Settings")
	14	onready var quit_button = main.get_node(@"Quit")
	15
	16	onready var settings_menu = ui.get_node(@"Settings")
	17	onready var settings_actions = settings_menu.get_node(@"Actions")
	18	onready var settings_action_apply = settings_actions.get_node(@"Apply")
	19	onready var settings_action_cancel = settings_actions.get_node(@"Cancel")
	20
	21	onready var multiplayer_menu = ui.get_node(@"Multiplayer")
	22	onready var multiplayer_LabelGWStatus = multiplayer_menu.get_node(@"HyperGatewayStatus").get_node(@"LabelGWStatus")
	23	onready var multiplayer_StartGW = multiplayer_menu.get_node(@"Gateway").get_node(@"Start")
	24	onready var multiplayer_StopGW = multiplayer_menu.get_node(@"Gateway").get_node(@"Stop")
	25	onready var multiplayer_LabelGossipStatus = multiplayer_menu.get_node(@"HyperGossipStatus").get_node(@"LabelGossipStatus")
	26	onready var multiplayer_PortInput = multiplayer_menu.get_node(@"HyperGatewayPort").get_node(@"LineEdit")
	27	onready var multiplayer_GossipURLInput = multiplayer_menu.get_node(@"GossipURL").get_node(@"LineEdit")
	28
	29	onready var shadows_menu = settings_menu.get_node(@"Shadows")
	30	onready var shadows_4096 = shadows_menu.get_node(@"4096")
	31	onready var shadows_2048 = shadows_menu.get_node(@"2048")
	32	onready var shadows_1024 = shadows_menu.get_node(@"1024")
	33	onready var shadows_disabled = shadows_menu.get_node(@"Disabled")
	34
	35	onready var gi_menu = settings_menu.get_node(@"GI")
	36	onready var gi_high = gi_menu.get_node(@"High")
	37	onready var gi_low = gi_menu.get_node(@"Low")
	38	onready var gi_disabled = gi_menu.get_node(@"Disabled")
	39
	40	onready var aa_menu = settings_menu.get_node(@"AA")
	41	onready var aa_8x = aa_menu.get_node(@"8x")
	42	onready var aa_4x = aa_menu.get_node(@"4x")
	43	onready var aa_2x = aa_menu.get_node(@"2x")
	44	onready var aa_disabled = aa_menu.get_node(@"Disabled")
	45
	46	onready var bloom_menu = settings_menu.get_node(@"Bloom")
	47	onready var bloom_high = bloom_menu.get_node(@"High")
	48	onready var bloom_low = bloom_menu.get_node(@"Low")
	49	onready var bloom_disabled = bloom_menu.get_node(@"Disabled")
	50
	51	var hyperGatewayNode : HyperGateway = null
	52	var hyperGatewayPID : int = 0
	53	var hyperGatewayPort : int = 0
	54
	55	var hyperGossipNode : HyperGossip = null
	56	var hyperGossipURL : String = ""
	57
	58	var hyperGWPortInputBackup : String = ""
	59
	60	var world_environment : WorldEnvironment = null
	61
	62	func _ready():
	63	get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_2D, SceneTree.STRETCH_ASPECT_KEEP, Vector2(1440, 810))
	64	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
	65
	66	func _getIsMenuShowing() -> bool:
	67	return ui.visible
	68
	69	func _on_quit_pressed():
	70	get_tree().quit()
	71
	72	func hideUI():
	73	Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
	74	ui.hide()
	75
	76	func showUI():
	77	# resetUI()
	78	ui.show()
	79	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
	80
	81	func resetUI():
	82	settings_menu.hide()
	83	multiplayer_menu.hide()
	84	main.show()
	85
	86	func _on_Resume_pressed():
	87	# Hide UI (for now)
	88	hideUI()
	89
	90	func _on_Quit_pressed():
	91	get_tree().quit()
	92
	93
	94	func _on_Settings_pressed():
	95	main.hide()
	96	settings_menu.show()
	97	settings_action_cancel.grab_focus()
	98
	99	# Find Environment Node
	100	if(world_environment == null):
	101	world_environment = get_tree().get_current_scene().find_node("WorldEnvironment", true, false)
	102
	103	if Settings.gi_quality == Settings.GIQuality.HIGH:
	104	gi_high.pressed = true
	105	elif Settings.gi_quality == Settings.GIQuality.LOW:
	106	gi_low.pressed = true
	107	elif Settings.gi_quality == Settings.GIQuality.DISABLED:
	108	gi_disabled.pressed = true
	109
	110	if Settings.aa_quality == Settings.AAQuality.AA_8X:
	111	aa_8x.pressed = true
	112	elif Settings.aa_quality == Settings.AAQuality.AA_4X:
	113	aa_4x.pressed = true
	114	elif Settings.aa_quality == Settings.AAQuality.AA_2X:
	115	aa_2x.pressed = true
	116	elif Settings.aa_quality == Settings.AAQuality.DISABLED:
	117	aa_disabled.pressed = true
	118
	119	if Settings.bloom_quality == Settings.BloomQuality.HIGH:
	120	bloom_high.pressed = true
	121	elif Settings.bloom_quality == Settings.BloomQuality.LOW:
	122	bloom_low.pressed = true
	123	elif Settings.bloom_quality == Settings.BloomQuality.DISABLED:
	124	bloom_disabled.pressed = true
	125
	126	func _UpdateHyperGatewayInfo():
	127	multiplayer_StartGW.disabled = false
	128	multiplayer_StopGW.disabled = true
	129	multiplayer_LabelGWStatus.text = "Not Running"
	130
	131	if(hyperGatewayNode != null):
	132	if(hyperGatewayNode is HyperGateway):
	133	hyperGatewayPID = hyperGatewayNode.getGatewayPID()
	134	hyperGatewayPort = hyperGatewayNode.getGatewayPort()
	135
	136	if( hyperGatewayNode.getIsGatewayRunning() ):
	137	multiplayer_StopGW.disabled = false
	138	multiplayer_StartGW.disabled = true
	139	multiplayer_LabelGWStatus.text = "Running (PID " + str(hyperGatewayPID) + ") on Port " + str(hyperGatewayPort)
	140
	141	func _UpdateHyperGossipInfo():
	142	multiplayer_LabelGossipStatus.text = "N/A"
	143	if(hyperGossipNode != null):
	144	if(hyperGossipNode is HyperGossip):
	145	if( hyperGatewayNode.getIsGatewayRunning() ):
	146	hyperGossipURL = hyperGossipNode._get_url()
	147	multiplayer_LabelGossipStatus.text = hyperGossipURL
	148
	149
	150	func _on_Multiplayer_pressed():
	151	main.hide()
	152	# Check for HyperGateway Node
	153	if(hyperGatewayNode == null):
	154	hyperGatewayNode = get_tree().get_current_scene().find_node("HyperGateway")
	155	_UpdateHyperGatewayInfo()
	156	# Check for HyperGossip Node
	157	if(hyperGossipNode == null):
	158	hyperGossipNode = get_tree().get_current_scene().find_node("HyperGossip")
	159	_UpdateHyperGossipInfo()
	160
	161
	162	multiplayer_menu.show()
	163
	164	func _on_Apply_pressed():
	165	main.show()
	166	# play_button.grab_focus()
	167	settings_menu.hide()
	168
	169	if shadows_4096.pressed:
	170	Settings.shadows_quality = Settings.ShadowsQuality.SHADOWS_4096
	171	ProjectSettings["rendering/quality/directional_shadow/size"] = 4096
	172	ProjectSettings["rendering/quality/shadow_atlas/size"] = 4096
	173	ProjectSettings["rendering/quality/shadows/filter_mode"] = 2
	174	elif shadows_2048.pressed:
	175	Settings.shadows_quality = Settings.ShadowsQuality.SHADOWS_2048
	176	ProjectSettings["rendering/quality/directional_shadow/size"] = 2048
	177	ProjectSettings["rendering/quality/shadow_atlas/size"] = 2048
	178	ProjectSettings["rendering/quality/shadows/filter_mode"] = 2
	179	elif shadows_1024.pressed:
	180	Settings.shadows_quality = Settings.ShadowsQuality.SHADOWS_1024
	181	ProjectSettings["rendering/quality/directional_shadow/size"] = 1024
	182	ProjectSettings["rendering/quality/shadow_atlas/size"] = 1024
	183	ProjectSettings["rendering/quality/shadows/filter_mode"] = 1
	184	elif shadows_disabled.pressed:
	185	Settings.shadows_quality = Settings.ShadowsQuality.DISABLED
	186	ProjectSettings["rendering/quality/directional_shadow/size"] = 0
	187	ProjectSettings["rendering/quality/shadow_atlas/size"] = 0
	188	ProjectSettings["rendering/quality/shadows/filter_mode"] = 0
	189
	190	if gi_high.pressed:
	191	Settings.gi_quality = Settings.GIQuality.HIGH
	192	ProjectSettings["rendering/quality/voxel_cone_tracing/high_quality"] = true
	193	elif gi_low.pressed:
	194	Settings.gi_quality = Settings.GIQuality.LOW
	195	ProjectSettings["rendering/quality/voxel_cone_tracing/high_quality"] = false
	196	elif gi_disabled.pressed:
	197	Settings.gi_quality = Settings.GIQuality.DISABLED
	198
	199	if aa_8x.pressed:
	200	Settings.aa_quality = Settings.AAQuality.AA_8X
	201	get_viewport().msaa = Viewport.MSAA_8X
	202	elif aa_4x.pressed:
	203	Settings.aa_quality = Settings.AAQuality.AA_4X
	204	get_viewport().msaa = Viewport.MSAA_4X
	205	elif aa_2x.pressed:
	206	Settings.aa_quality = Settings.AAQuality.AA_2X
	207	get_viewport().msaa = Viewport.MSAA_2X
	208	elif aa_disabled.pressed:
	209	Settings.aa_quality = Settings.AAQuality.DISABLED
	210	get_viewport().msaa = Viewport.MSAA_DISABLED
	211
	212	if bloom_high.pressed:
	213	Settings.bloom_quality = Settings.BloomQuality.HIGH
	214	if(world_environment != null):
	215	world_environment.environment.glow_enabled = true
	216	world_environment.environment.glow_bicubic_upscale = true
	217	elif bloom_low.pressed:
	218	Settings.bloom_quality = Settings.BloomQuality.LOW
	219	if(world_environment != null):
	220	world_environment.environment.glow_enabled = true
	221	world_environment.environment.glow_bicubic_upscale = false
	222	elif bloom_disabled.pressed:
	223	Settings.bloom_quality = Settings.BloomQuality.DISABLED
	224	if(world_environment != null):
	225	world_environment.environment.glow_enabled = false
	226	world_environment.environment.glow_bicubic_upscale = false
	227
	228	Settings.save_settings()
	229
	230
	231	func _on_Cancel_pressed():
	232	main.show()
	233	# play_button.grab_focus()
	234	settings_menu.hide()
	235
	236
	237	func _on_Multiplayer_Cancel_pressed():
	238	main.show()
	239	# play_button.grab_focus()
	240	multiplayer_menu.hide()
	241
	242
	243	func _on_Multiplayer_Apply_pressed():
	244	main.show()
	245	# play_button.grab_focus()
	246	multiplayer_menu.hide()
	247
	248
	249	func _on_Start_pressed():
	250	hyperGatewayNode.port = multiplayer_PortInput.text
	251	hyperGossipNode.url = multiplayer_GossipURLInput.text
	252	hyperGatewayNode.start()
	253	_UpdateHyperGatewayInfo()
	254	_UpdateHyperGossipInfo()
	255
	256
	257	func _on_Stop_pressed():
	258	hyperGatewayNode.stop()
	259	multiplayer_PortInput
	260	_UpdateHyperGatewayInfo()
	261	_UpdateHyperGossipInfo()
	262
	263
	264	func _on_HyperGWPort_LineEdit_text_changed(new_text : String):
	265	if(new_text.length() < 1 or new_text.is_valid_integer() or new_text.to_int() > 65535):
	266	hyperGWPortInputBackup = new_text
	267	else:
	268	multiplayer_PortInput.text = hyperGWPortInputBackup

menu/main/menu_main.scn +0 -0

(no content changes — binary or rename)

project.godot +4 -0

…	…	@@ -60,6 +60,10 @@ config/name="Marbles of Violence"
60	60	run/main_scene="res://main.tscn"
61	61	config/icon="res://icon.png"
62	62
	63	[autoload]
	64
	65	Settings="*res://settings.gd"
	66
63	67	[display]
64	68
65	69	window/size/width=1600

settings.gd +79 -0

…	…	@@ -0,0 +1,79 @@
	1	extends Node
	2
	3	enum ShadowsQuality {
	4	DISABLED = 0,
	5	SHADOWS_1024 = 1,
	6	SHADOWS_2048 = 2,
	7	SHADOWS_4096 = 3,
	8	}
	9
	10	enum GIQuality {
	11	DISABLED = 0,
	12	LOW = 1,
	13	HIGH = 2,
	14	}
	15
	16	enum AAQuality {
	17	DISABLED = 0,
	18	AA_2X = 1,
	19	AA_4X = 2,
	20	AA_8X = 3,
	21	}
	22
	23	enum SSAOQuality {
	24	DISABLED = 0,
	25	LOW = 1,
	26	HIGH = 2,
	27	}
	28
	29	enum BloomQuality {
	30	DISABLED = 0,
	31	LOW = 1,
	32	HIGH = 2,
	33	}
	34
	35	enum Resolution {
	36	RES_540 = 0,
	37	RES_720 = 1,
	38	RES_1080 = 2,
	39	NATIVE = 3,
	40	}
	41
	42	var shadows_quality = ShadowsQuality.SHADOWS_1024
	43	var gi_quality = GIQuality.LOW
	44	var aa_quality = AAQuality.AA_2X
	45	var bloom_quality = BloomQuality.HIGH
	46
	47	func _ready():
	48	load_settings()
	49
	50	func load_settings():
	51	var f = File.new()
	52	var error = f.open("user://settings.json", File.READ)
	53	if error:
	54	print("There are no settings to load.")
	55	return
	56
	57	var d = parse_json(f.get_as_text())
	58	if typeof(d) != TYPE_DICTIONARY:
	59	return
	60
	61	if "shadows" in d:
	62	shadows_quality = int(d.shadows)
	63
	64	if "gi" in d:
	65	gi_quality = int(d.gi)
	66
	67	if "aa" in d:
	68	aa_quality = int(d.aa)
	69
	70	if "bloom" in d:
	71	bloom_quality = int(d.bloom)
	72
	73	func save_settings():
	74	var f = File.new()
	75	var error = f.open("user://settings.json", File.WRITE)
	76	assert(not error)
	77
	78	var d = { "shadows":shadows_quality, "gi":gi_quality, "aa":aa_quality, "bloom":bloom_quality }
	79	f.store_line(to_json(d))

special_input.gd +20 -1

…	…	@@ -1,12 +1,25 @@
1	1	extends Node
2	2
3	3	var bDebugPaused : bool = false
	4	var mouseModeBackup
	5	var UINode = null
4	6
5	7	signal reset_ball()
6	8
7	9	func _ready():
8	10	bDebugPaused = false
9	11	get_tree().paused = false
	12
	13	func HandleMouseToggle():
	14	if Input.get_mouse_mode() != Input.MOUSE_MODE_VISIBLE:
	15	mouseModeBackup = Input.get_mouse_mode()
	16	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
	17	else:
	18	Input.set_mouse_mode(mouseModeBackup)
	19
	20	func CheckAndUpdateUINode():
	21	if(UINode == null):
	22	UINode = get_tree().get_current_scene().find_node("Menu_Main")
10	23
11	24	func _process(_delta):
12	25	if Input.is_action_just_pressed("debug_pause"):
…	…	@@ -16,7 +29,13 @@ func _process(_delta):
16	29	else:
17	30	get_tree().paused = false
18	31	if Input.is_action_just_pressed("ui_cancel"):
19		get_tree().quit()
	32	# Toggle UI
	33	CheckAndUpdateUINode()
	34	if(UINode._getIsMenuShowing() ):
	35	UINode.hideUI()
	36	else:
	37	UINode.resetUI()
	38	UINode.showUI()
20	39	if Input.is_action_just_pressed("restart_level"):
21	40	# get_tree().reload_current_scene()
22	41	emit_signal("reset_ball")

ui/marblesofviolencelogo.png +0 -0

(no content changes — binary or rename)

godot-marble_madness_demo commits / f7c7bdc

Changed files (12) +419 -9