game/bom
Code Issues Pull Requests Activity

Improved server

Browse Source
This commit is contained in:
Eduard Urbach
2024-01-26 00:29:05 +01:00
parent 816337ede5
commit 0172a81bdf
17 changed files with 286 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/network/Login.gd
View File

@ -1,8 +1,11 @@
extends PacketHandler
var auth_token: String
var instance_id := OS.get_process_id() % 4
var username := "user%d" % instance_id
func _ready():
DisplayServer.window_set_title(username)
send_login()
func handle_packet(data: PackedByteArray, _peer: PacketPeer):
@ -17,10 +20,11 @@ func handle_packet(data: PackedByteArray, _peer: PacketPeer):
func send_login():
if is_logged_in():
return
var password := "password"
var buffer := StreamPeerBuffer.new()
buffer.put_8(Packet.LOGIN)
buffer.put_data(JSON.stringify(["user1", "password"]).to_utf8_buffer())
buffer.put_data(JSON.stringify([username, password]).to_utf8_buffer())
%Client.socket.put_packet(buffer.data_array)
print("[Client] Connecting...")

9
client/network/PlayerState.gd
View File

@ -17,9 +17,14 @@ func handle_packet(data: PackedByteArray, _peer: PacketPeer):
print(server_position)
var player := spawn_player()
player.name = player_name
player.position = server_position
Global.player = player
player.set_character_name(player_name)
if false:
Global.player = player
var controller := PlayerController.new()
controller.character = Global.player
Global.player.add_child(controller)
func spawn_player() -> Player:
var player = player_scene.instantiate()

7
client/player/Player.gd
View File

@ -1,7 +1,6 @@
class_name Player
extends Character
func _ready():
var controller := PlayerController.new()
controller.character = self
add_child(controller)
func set_character_name(new_name: String):
name = new_name
get_node("Label").text = name

10
client/player/Player.tscn
View File

@ -1,8 +1,7 @@
[gd_scene load_steps=6 format=3 uid="uid://2lcnu3dy54lx"]
[gd_scene load_steps=5 format=3 uid="uid://2lcnu3dy54lx"]
[ext_resource type="Script" path="res://player/Player.gd" id="1_8gebs"]
[ext_resource type="PackedScene" uid="uid://2bbycjulf00g" path="res://character/health/HealthComponent.tscn" id="2_np5ag"]
[ext_resource type="Script" path="res://player/controller/PlayerController.gd" id="3_oox5k"]
[sub_resource type="PrismMesh" id="PrismMesh_y7abh"]
size = Vector3(0.5, 1.6, 0.5)
@ -29,6 +28,7 @@ shape = SubResource("CapsuleShape3D_2f50n")
[node name="Health" parent="." instance=ExtResource("2_np5ag")]
[node name="Controller" type="Node" parent="." node_paths=PackedStringArray("character")]
script = ExtResource("3_oox5k")
character = NodePath("..")
[node name="Label" type="Label3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8, 0)
billboard = 1
text = "ABC"

5
client/world/Client.tscn
View File

@ -68,10 +68,10 @@ camera_attributes = ExtResource("9_w4cdu")
[node name="Trees" type="Node3D" parent="World"]
[node name="Tree" parent="World/Trees" instance=ExtResource("11_wlyv1")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.11323, 0, -4.64839)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.11323, 0, -7.57074)
[node name="Tree2" parent="World/Trees" instance=ExtResource("11_wlyv1")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.11323, 0, 5.35161)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.11323, 0, 7.80548)
[node name="Enemies" type="Node3D" parent="World"]
@ -118,6 +118,7 @@ follow_speed = 5.0
[node name="PostProcessing" type="MeshInstance3D" parent="Viewport/SubViewport/CameraPivot/Camera"]
unique_name_in_owner = true
visible = false
extra_cull_margin = 16384.0
mesh = SubResource("QuadMesh_7yiqd")