Dustin/Attempt2
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Integrating Connection UI. Removing what is not needed from templates.

Browse Source
This commit is contained in:
Dustin 2025-04-17 09:00:58 -07:00
parent 8acc796245
commit ae3da7a468
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Main.tscn
View File

@ -1,6 +1,5 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=6 format=2]
[ext_resource path="res://src/World.tscn" type="PackedScene" id=1]
[ext_resource path="res://src/ui/scene_transition.tscn" type="PackedScene" id=4] [ext_resource path="res://src/ui/scene_transition.tscn" type="PackedScene" id=4]
[ext_resource path="res://src/Main.gd" type="Script" id=7] [ext_resource path="res://src/Main.gd" type="Script" id=7]
[ext_resource path="res://src/ui/lobby.tscn" type="PackedScene" id=9] [ext_resource path="res://src/ui/lobby.tscn" type="PackedScene" id=9]
@ -38,5 +37,3 @@ render_target_update_mode = 3
[node name="Lobby" parent="ViewportContainer/Viewport" instance=ExtResource( 9 )] [node name="Lobby" parent="ViewportContainer/Viewport" instance=ExtResource( 9 )]
[node name="SceneTransition" parent="ViewportContainer/Viewport" instance=ExtResource( 4 )] [node name="SceneTransition" parent="ViewportContainer/Viewport" instance=ExtResource( 4 )]
[node name="World" parent="ViewportContainer/Viewport" instance=ExtResource( 1 )]

8
lib/singleton_autoloads/LevelInfo.gd
View File

@ -38,16 +38,16 @@ func change_level(_level_name :String, _position_name :String):
var new_level = load("res://src/levels/" + _level_name + ".tscn" ).instance() var new_level = load("res://src/levels/" + _level_name + ".tscn" ).instance()
#print (get_tree().get_root().get_children()) #print (get_tree().get_root().get_children())
for l in get_node("/root/Main/ViewportContainer/Viewport").get_children(): for l in get_node("/root/Main/ViewportContainer/Viewport/World").get_children():
#print (get_node("/root/Main").get_children()) #print (get_node("/root/Main").get_children())
if l is Level: if l is Level:
camera_guide.disable_tracking() camera_guide.disable_tracking()
SceneTransition.transition_dissolve("foo") SceneTransition.transition_dissolve("foo")
yield(SceneTransition,"done") yield(SceneTransition,"done")
print(l) print(l)
get_node("/root/Main/ViewportContainer/Viewport").remove_child(l) get_node("/root/Main/ViewportContainer/Viewport/World").remove_child(l)
get_node("/root/Main/ViewportContainer/Viewport").add_child(new_level) get_node("/root/Main/ViewportContainer/Viewport/World").add_child(new_level)
get_node("/root/Main/ViewportContainer/Viewport").move_child(new_level,1) get_node("/root/Main/ViewportContainer/Viewport/World").move_child(new_level,1)
##TODO: Probably set start position ##TODO: Probably set start position
if new_level.entrances.has(_position_name): if new_level.entrances.has(_position_name):
player_start_position = new_level.entrances[_position_name].transform.origin player_start_position = new_level.entrances[_position_name].transform.origin

19
lib/singleton_autoloads/NetworkManager.gd
View File

@ -101,14 +101,15 @@ remote func pre_start_game(spawn_points):
#player.position=spawn_pos #player.position=spawn_pos
player.set_network_master(p_id) #set unique id as master. player.set_network_master(p_id) #set unique id as master.
if p_id == get_tree().get_network_unique_id(): # We don't yet use a player name like a node yet
# If node for this peer id, set name. # if p_id == get_tree().get_network_unique_id():
player.set_player_name(player_name) # # If node for this peer id, set name.
else: # player.set_player_name(player_name)
# Otherwise set name from peer. # else:
player.set_player_name(players[p_id]) # # Otherwise set name from peer.
# player.set_player_name(players[p_id])
world.get_node("/root/Main/ViewportContainer/Viewport").add_child(player) world.get_node("/root/Main/ViewportContainer/Viewport/World").add_child(player)
#world.get_node("Players").add_child(player) #world.get_node("Players").add_child(player)
# # Set up score. # # Set up score.
@ -179,9 +180,9 @@ func begin_game():
func end_game(): func end_game():
if has_node("/root/World"): # Game is in progress. if has_node("/root/Main/ViewportContainer/Viewport/World"): # Game is in progress.
# End it # End it
get_node("/root/World").queue_free() get_node("/root/Main/ViewportContainer/Viewport/World").queue_free()
emit_signal("game_ended") emit_signal("game_ended")
players.clear() players.clear()