Skip to content

Commit

Permalink
Added usernames above players' heads
Browse files Browse the repository at this point in the history
  • Loading branch information
tom-weiland committed Nov 30, 2021
1 parent 12bca39 commit 033a6af
Show file tree
Hide file tree
Showing 7 changed files with 234 additions and 13 deletions.
196 changes: 195 additions & 1 deletion Assets/RiptideSteamTransport/Demos/PlayerHosted/Prefabs/Player.prefab
Original file line number Diff line number Diff line change
@@ -1,5 +1,198 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2208247352977293879
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6950739779104851623}
- component: {fileID: 1658231697045743900}
- component: {fileID: 1650009439996896082}
- component: {fileID: 9026349940657517391}
- component: {fileID: 40372994729832653}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6950739779104851623
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2208247352977293879}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.01, y: 0.01, z: 1}
m_Children:
- {fileID: 8994331199469945932}
m_Father: {fileID: 6296381778400844046}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 1.25}
m_SizeDelta: {x: 240, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &1658231697045743900
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2208247352977293879}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &1650009439996896082
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2208247352977293879}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
--- !u!114 &9026349940657517391
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2208247352977293879}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &40372994729832653
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2208247352977293879}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e9519be383d83d43b76576bfdb1896e, type: 3}
m_Name:
m_EditorClassIdentifier:
usernameText: {fileID: 0}
--- !u!1 &2383576053055539785
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8994331199469945932}
- component: {fileID: 7513318010278504239}
- component: {fileID: 2434653561257851922}
m_Layer: 5
m_Name: NameText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8994331199469945932
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2383576053055539785}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6950739779104851623}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7513318010278504239
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2383576053055539785}
m_CullTransparentMesh: 1
--- !u!114 &2434653561257851922
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2383576053055539785}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8669583, g: 1, b: 0.3820755, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 83
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &6296381778400844037
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -29,7 +222,8 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 6950739779104851623}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using RiptideNetworking.Transports.SteamTransport;
using System;
using UnityEngine;
using SteamClient = RiptideNetworking.Transports.SteamTransport.SteamClient;

namespace RiptideNetworking.Demos.SteamTransport.PlayerHosted
{
Expand Down Expand Up @@ -133,7 +132,9 @@ private void ServerPlayerLeft(object sender, ClientDisconnectedEventArgs e)

private void DidConnect(object sender, EventArgs e)
{
UIManager.Singleton.SendName();
Message message = Message.Create(MessageSendMode.reliable, (ushort)ClientToServerId.playerName);
message.Add(Steamworks.SteamFriends.GetPersonaName());
Client.Send(message);
}

private void FailedToConnect(object sender, EventArgs e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ public static void Spawn(ushort id, string username, Vector3 position)
if (id == NetworkManager.Singleton.Client.Id)
player = Instantiate(NetworkManager.Singleton.LocalPlayerPrefab, position, Quaternion.identity).GetComponent<ClientPlayer>();
else
{
player = Instantiate(NetworkManager.Singleton.PlayerPrefab, position, Quaternion.identity).GetComponent<ClientPlayer>();
player.GetComponentInChildren<PlayerUIManager>().SetName(username);
}

player.name = $"Client Player {id} ({username})";
player.id = id;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using UnityEngine;
using UnityEngine.UI;

namespace RiptideNetworking.Demos.SteamTransport.PlayerHosted
{
internal class PlayerUIManager : MonoBehaviour
{
[SerializeField] private Text usernameText;

private void Update()
{
if (ClientPlayer.list.TryGetValue(NetworkManager.Singleton.Client.Id, out ClientPlayer player))
transform.rotation = Quaternion.LookRotation(transform.position - player.transform.position);
}

internal void SetName(string _name)
{
usernameText.text = _name;
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private Message GetSpawnData(Message message)
[MessageHandler((ushort)ClientToServerId.playerName)]
private static void PlayerName(ushort fromClientId, Message message)
{
Spawn(fromClientId, /* TODO: message.GetString() */ "");
Spawn(fromClientId, message.GetString());
}

[MessageHandler((ushort)ClientToServerId.playerInput)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,5 @@ internal void UpdateUIVisibility()
else
lobbyMenu.SetActive(false);
}

#region Messages
public void SendName()
{
Message message = Message.Create(MessageSendMode.reliable, (ushort)ClientToServerId.playerName);
// TODO: message.Add(usernameField.text);
NetworkManager.Singleton.Client.Send(message);
}
#endregion
}
}

0 comments on commit 033a6af

Please sign in to comment.