fixes for mouse dragger, visualization for audio range, added some more callbacks to velnetmanager, added color syncing extension, take ownership of synced textbox, fix for deleting all scene objects

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/MouseDragger.cs

@@ -20,7 +20,7 @@ public class MouseDragger : MonoBehaviour
 			{
 				foreach (string draggableTag in draggableTags)
 				{
-					if (hit.transform.CompareTag(draggableTag) || hit.transform.parent == null || hit.transform.parent.CompareTag(draggableTag))
+					if (hit.transform.CompareTag(draggableTag) || (hit.transform.parent != null && hit.transform.parent.CompareTag(draggableTag)))
 					{
 						NetworkObject netObj = hit.transform.GetComponent<NetworkObject>();
 						netObj ??= hit.transform.GetComponentInParent<NetworkObject>();

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/NetworkGUI.cs

@@ -10,14 +10,16 @@ namespace VelNet
 {
 	public class NetworkGUI : MonoBehaviour
 	{
-		[FormerlySerializedAs("networkManager")] public VelNetManager velNetManager;
+		[FormerlySerializedAs("networkManager")]
+		public VelNetManager velNetManager;
+
 		public InputField userInput;
 		public InputField sendInput;
 		public InputField roomInput;
 		public Text messages;
 		public List<string> messageBuffer;
 		public Dropdown microphones;
-		DissonanceComms comms;
+		private DissonanceComms comms;
 
 		public void HandleSend()
 		{
@@ -42,6 +44,7 @@ namespace VelNet
 				VelNetManager.GetRooms();
 			}
 		}
+
 		public void HandleJoin()
 		{
 			if (roomInput.text != "")
@@ -61,29 +64,9 @@ namespace VelNet
 			comms = FindObjectOfType<DissonanceComms>();
 			microphones.AddOptions(new List<string>(Microphone.devices));
 
-			/* todo
-			VelNetManager.MessageReceived += (m) =>
-			{
-				string s = m.type + ":" + m.sender + ":" + m.text;
-				messageBuffer.Add(s);
-				messages.text = "";
-
-
-				if (messageBuffer.Count > 10)
-				{
-					messageBuffer.RemoveAt(0);
-				}
-
-				foreach (string msg in messageBuffer)
-				{
-					messages.text = messages.text + msg + "\n";
-				}
-			};
-			*/
 			StartCoroutine(testes());
-			
-			
 		}
+
 		IEnumerator testes()
 		{
 			yield return new WaitForSeconds(1.0f);

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/PlayerController.cs

@@ -1,25 +1,30 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using UnityEngine;
+using Random = UnityEngine.Random;
 
 namespace VelNet
 {
-	public class PlayerController : NetworkComponent
+	public class PlayerController : NetworkSerializedObjectStream
 	{
-		public Vector3 targetPosition;
+		private Renderer rend;
-		public Quaternion targetRotation;
+		public Color color;
 
+		private void Start()
+		{
+			rend = GetComponent<MeshRenderer>();
+			if (IsMine)
+			{
+				color = new Color(Random.Range(0, 1f), Random.Range(0, 1f), Random.Range(0, 1f));
+				rend.material.color = color;
+			}
+		}
 
 		// Update is called once per frame
 		private void Update()
 		{
-			// if (!IsMine)
-			// {
-			// 	transform.position = Vector3.Lerp(transform.position, targetPosition, .1f);
-			// 	transform.rotation = Quaternion.Slerp(transform.rotation, targetRotation, .1f);
-			// }
-			// else
 			if (IsMine)
 			{
 				Vector3 movement = new Vector3();
@@ -43,37 +48,30 @@ namespace VelNet
 
 				if (Input.GetKeyDown(KeyCode.Backspace))
 				{
-					foreach (KeyValuePair<string, NetworkObject> kvp in VelNetManager.instance.objects.Where(kvp => !kvp.Value.ownershipLocked))
+					foreach (string key in VelNetManager.instance.objects
+						         .Where(kvp => !kvp.Value.ownershipLocked)
+						         .Select(kvp => kvp.Key).ToArray())
 					{
-						VelNetManager.NetworkDestroy(kvp.Key);
+						VelNetManager.NetworkDestroy(key);
 					}
 				}
 			}
 		}
 
-		//
+		protected override void SendState(BinaryWriter binaryWriter)
-		// protected override byte[] SendState()
-		// {
-		// 	using MemoryStream mem = new MemoryStream();
-		// 	using BinaryWriter writer = new BinaryWriter(mem);
-		//
-		// 	writer.Write(transform.position);
-		// 	writer.Write(transform.rotation);
-		//
-		// 	return mem.ToArray();
-		// }
-		//
-		// protected override void ReceiveState(byte[] message)
-		// {
-		// 	using MemoryStream mem = new MemoryStream(message);
-		// 	using BinaryReader reader = new BinaryReader(mem);
-		//
-		// 	targetPosition = reader.ReadVector3();
-		// 	targetRotation = reader.ReadQuaternion();
-		// }
-		public override void ReceiveBytes(byte[] message)
 		{
-			throw new System.NotImplementedException();
+			binaryWriter.Write(color);
+		}
+
+		protected override void ReceiveState(BinaryReader binaryReader)
+		{
+			Color newColor = binaryReader.ReadColor();
+			if (newColor != color)
+			{
+				rend.material.color = newColor;
+			}
+
+			color = newColor;
 		}
 	}
 }

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/PlayerPrefab.prefab

@@ -1,5 +1,86 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2802320351940726854
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6602982999811082154}
+  - component: {fileID: 6433756913090684124}
+  - component: {fileID: 6919422133110223353}
+  m_Layer: 0
+  m_Name: Dissonance Range
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6602982999811082154
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2802320351940726854}
+  m_LocalRotation: {x: -0.70710635, y: -0, z: -0, w: 0.7071073}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 8, y: 0.1, z: 8}
+  m_Children: []
+  m_Father: {fileID: 3076416102083120807}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+--- !u!33 &6433756913090684124
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2802320351940726854}
+  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6919422133110223353
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2802320351940726854}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 6fad1ca32acea73489c2c4b898cdb9d4, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &6139051692386484099
 GameObject:
   m_ObjectHideFlags: 0
@@ -33,7 +114,8 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
-  m_Children: []
+  m_Children:
+  - {fileID: 6602982999811082154}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -113,6 +195,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ownershipLocked: 1
   networkId: 
+  sceneNetworkId: 0
   prefabName: 
   isSceneObject: 0
   syncedComponents:
@@ -132,8 +215,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   networkObject: {fileID: 9102273340480352682}
-  targetPosition: {x: 0, y: 0, z: 0}
+  serializationRateHz: 30
-  targetRotation: {x: 0, y: 0, z: 0, w: 0}
+  color: {r: 0, g: 0, b: 0, a: 0}
 --- !u!114 &1181612843795795320
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -147,6 +230,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   networkObject: {fileID: 9102273340480352682}
+  useTcp: 0
   dissonanceID: 
   closePlayers: 
   maxDistance: 2
@@ -163,5 +247,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   networkObject: {fileID: 9102273340480352682}
-  serializationRateHz: 1
+  serializationRateHz: 60
   useLocalTransform: 0
+  teleportDistance: 0
+  teleportAngle: 0

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/SyncedTextbox.cs

@@ -16,4 +16,9 @@ public class SyncedTextbox : NetworkSerializedObjectStream
 	{
 		text.text = binaryReader.ReadString();
 	}
+
+	public void TakeOwnership()
+	{
+		networkObject.TakeOwnership();
+	}
 }

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/TestNetworkedGameObject.prefab

@@ -1,5 +1,100 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6003361529827848619
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7099230484513283147}
+  - component: {fileID: 8811139817265458480}
+  - component: {fileID: 3776025769317911085}
+  - component: {fileID: 1426238303320144522}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: TestSphere
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7099230484513283147
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6003361529827848619}
+  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: 8565720275311462455}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8811139817265458480
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6003361529827848619}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3776025769317911085
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6003361529827848619}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &1426238303320144522
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6003361529827848619}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &8565720275311462453
 GameObject:
   m_ObjectHideFlags: 0
@@ -13,7 +108,7 @@ GameObject:
   - component: {fileID: 8565720275311462452}
   m_Layer: 0
   m_Name: TestNetworkedGameObject
-  m_TagString: TestSphere
+  m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -29,7 +124,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 8565720276181857624}
+  - {fileID: 7099230484513283147}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -67,98 +162,5 @@ MonoBehaviour:
   networkObject: {fileID: 3951900052977689805}
   serializationRateHz: 60
   useLocalTransform: 0
---- !u!1 &8565720276181857625
+  teleportDistance: 0
-GameObject:
+  teleportAngle: 0
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8565720276181857624}
-  - component: {fileID: 8565720276181857605}
-  - component: {fileID: 8565720276181857626}
-  - component: {fileID: 8565720276181857627}
-  m_Layer: 0
-  m_Name: Sphere
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8565720276181857624
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8565720276181857625}
-  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: 8565720275311462455}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &8565720276181857605
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8565720276181857625}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &8565720276181857626
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8565720276181857625}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!135 &8565720276181857627
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8565720276181857625}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/TransparentMat.mat

@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: TransparentMat
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 0
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 0.03137255}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/TransparentMat.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6fad1ca32acea73489c2c4b898cdb9d4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/test.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 009dc4ba29f14b649beb8c3eaad89f15
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/test.unity

@@ -20,13 +20,13 @@ RenderSettings:
   m_FogDensity: 0.01
   m_LinearFogStart: 0
   m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientSkyColor: {r: 0.5137255, g: 0.53333336, b: 0.5647059, a: 1}
   m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
   m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
   m_AmbientIntensity: 1
-  m_AmbientMode: 0
+  m_AmbientMode: 3
   m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+  m_SkyboxMaterial: {fileID: 0}
   m_HaloStrength: 0.5
   m_FlareStrength: 1
   m_FlareFadeSpeed: 3
@@ -37,8 +37,8 @@ RenderSettings:
   m_ReflectionBounces: 1
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 0}
+  m_Sun: {fileID: 652307110}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -97,7 +97,7 @@ LightmapSettings:
     m_ExportTrainingData: 0
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 0}
+  m_LightingDataAsset: {fileID: 112000000, guid: d1b34f106c04378428823df374b0e07c, type: 2}
   m_LightingSettings: {fileID: 0}
 --- !u!196 &4
 NavMeshSettings:
@@ -608,7 +608,7 @@ RectTransform:
   - {fileID: 948755938}
   - {fileID: 545137760}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -779,6 +779,85 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &498776799
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 498776800}
+  - component: {fileID: 498776802}
+  - component: {fileID: 498776801}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &498776800
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498776799}
+  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: 1992361063}
+  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!114 &498776801
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498776799}
+  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.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  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: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Take Ownership
+--- !u!222 &498776802
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498776799}
+  m_CullTransparentMesh: 1
 --- !u!1 &545137759
 GameObject:
   m_ObjectHideFlags: 0
@@ -813,11 +892,11 @@ RectTransform:
   m_Father: {fileID: 244561620}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -382, y: -321}
+  m_AnchoredPosition: {x: 5, y: 165.7}
   m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 0}
 --- !u!114 &545137761
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1221,7 +1300,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &711524766
 GameObject:
@@ -1629,7 +1708,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_BackGroundColor: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -1644,7 +1723,7 @@ Camera:
     height: 1
   near clip plane: 0.3
   far clip plane: 1000
-  field of view: 60
+  field of view: 40
   orthographic: 0
   orthographic size: 5
   m_Depth: -1
@@ -1670,11 +1749,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 903768653}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
+  m_LocalPosition: {x: 0, y: 1, z: -20}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &912887455
 GameObject:
@@ -2051,6 +2130,7 @@ RectTransform:
   m_Children:
   - {fileID: 359309141}
   - {fileID: 1840952814}
+  - {fileID: 1992361063}
   m_Father: {fileID: 244561620}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2088,6 +2168,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ownershipLocked: 0
   networkId: 
+  sceneNetworkId: 2
   prefabName: 
   isSceneObject: 1
   syncedComponents:
@@ -2440,7 +2521,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1099803616
 MonoBehaviour:
@@ -2454,11 +2535,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 233344de094f11341bdb834d564708dc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  host: 127.0.0.1
+  host: 129.159.107.234
   port: 80
   udpConnected: 0
   userid: -1
-  room: 
   connected: 0
   prefabs:
   - {fileID: 9102273340480352682, guid: d4158ab9c4a204cdbba28d3273fc1fb3, type: 3}
@@ -3007,7 +3087,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1434745021
 MonoBehaviour:
@@ -3793,7 +3873,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1894247853
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3934,6 +4014,139 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -0.5}
   m_SizeDelta: {x: -20, y: -13}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1992361062
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1992361063}
+  - component: {fileID: 1992361066}
+  - component: {fileID: 1992361065}
+  - component: {fileID: 1992361064}
+  m_Layer: 5
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1992361063
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1992361062}
+  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:
+  - {fileID: 498776800}
+  m_Father: {fileID: 948755938}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 31.6}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 1, y: 1}
+--- !u!114 &1992361064
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1992361062}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1992361065}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 948755939}
+        m_TargetAssemblyTypeName: SyncedTextbox, Assembly-CSharp
+        m_MethodName: TakeOwnership
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &1992361065
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1992361062}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1992361066
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1992361062}
+  m_CullTransparentMesh: 1
 --- !u!1 &2033163676
 GameObject:
   m_ObjectHideFlags: 0
@@ -4174,8 +4387,8 @@ PrefabInstance:
       propertyPath: isSceneObject
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8565720275311462452, guid: 6e4a023f70e01405e8b249a4488fe319, type: 3}
+    - target: {fileID: 3951900052977689805, guid: 6e4a023f70e01405e8b249a4488fe319, type: 3}
-      propertyPath: serializationRateHz
+      propertyPath: sceneNetworkId
       value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8565720275311462453, guid: 6e4a023f70e01405e8b249a4488fe319, type: 3}

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/test/LightingData.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d1b34f106c04378428823df374b0e07c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 112000000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

TestVelGameServer/Packages/VelNetUnity/Runtime/Util/BinaryWriterExtensions.cs

@@ -8,6 +8,8 @@ namespace VelNet
 {
 	public static class BinaryWriterExtensions
 	{
+		#region Writers
+
 		public static void Write(this BinaryWriter writer, Vector3 v)
 		{
 			writer.Write(v.x);
@@ -23,6 +25,18 @@ namespace VelNet
 			writer.Write(q.w);
 		}
 
+		public static void Write(this BinaryWriter writer, Color c)
+		{
+			writer.Write(c.r);
+			writer.Write(c.g);
+			writer.Write(c.b);
+			writer.Write(c.a);
+		}
+
+		#endregion
+
+		#region Readers
+
 		public static Vector3 ReadVector3(this BinaryReader reader)
 		{
 			return new Vector3(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
@@ -38,6 +52,19 @@ namespace VelNet
 			);
 		}
 
+		public static Color ReadColor(this BinaryReader reader)
+		{
+			return new Color(
+				reader.ReadSingle(),
+				reader.ReadSingle(),
+				reader.ReadSingle(),
+				reader.ReadSingle()
+			);
+		}
+
+		#endregion
+
+
 		/// <summary>
 		/// Compresses the list of bools into bytes using a bitmask
 		/// </summary>
@@ -88,6 +115,5 @@ namespace VelNet
 		{
 			return (b & (1 << index)) != 0;
 		}
-		
 	}
 }

TestVelGameServer/Packages/VelNetUnity/Runtime/VelNetManager.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
@@ -8,8 +7,6 @@ using System.Threading;
 using UnityEngine;
 using System.Net;
 using UnityEngine.SceneManagement;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Runtime.Serialization;
 using System.IO;
 
 namespace VelNet
@@ -42,10 +39,11 @@ namespace VelNet
 		private Thread clientReceiveThread;
 		private Thread clientReceiveThreadUDP;
 		public int userid = -1;
-		private int messagesReceived = 0;
 
 		public readonly Dictionary<int, VelNetPlayer> players = new Dictionary<int, VelNetPlayer>();
 
+		#region Callbacks
+
 		/// <summary>
 		/// We just joined a room
 		/// string - the room name
@@ -69,8 +67,12 @@ namespace VelNet
 		public static Action<VelNetPlayer> OnPlayerLeft;
 
 		public static Action OnConnectedToServer;
-		public static Action LoggedIn;
+		public static Action OnLoggedIn;
-		public static Action<string[], int> RoomsReceived;
+		public static Action<RoomsMessage> RoomsReceived;
+
+		public static Action<Message> MessageReceived;
+
+		#endregion
 
 		public bool connected;
 
@@ -107,38 +109,52 @@ namespace VelNet
 
 		public static bool IsConnected => instance != null && instance.connected && instance.udpConnected;
 
-
 		//this is for sending udp packets
-		static byte[] toSend = new byte[1024];
+		private static readonly byte[] toSend = new byte[1024];
 
 		// Use this for initialization
 		public abstract class Message
 		{
-			
 		}
+
 		public class ListedRoom
 		{
 			public string name;
 			public int numUsers;
+
+			public override string ToString()
+			{
+				return "Room Name: " + name + "\tUsers: " + numUsers;
 			}
+		}
+
 		public class LoginMessage : Message
 		{
 			public int userId;
 		}
+
 		public class RoomsMessage : Message
 		{
 			public List<ListedRoom> rooms;
+
+			public override string ToString()
+			{
+				return string.Join("\n", rooms);
 			}
+		}
+
 		public class JoinMessage : Message
 		{
 			public int userId;
 			public string room;
 		}
+
 		public class DataMessage : Message
 		{
 			public int senderId;
 			public byte[] data;
 		}
+
 		public class ChangeMasterMessage : Message
 		{
 			public int masterId;
@@ -146,7 +162,6 @@ namespace VelNet
 
 		public class ConnectedMessage : Message
 		{
-			
 		}
 
 		public readonly List<Message> receivedMessages = new List<Message>();
@@ -180,6 +195,15 @@ namespace VelNet
 				//Debug.Log(messagesReceived++);
 				receivedMessages.Add(m);
 			}
+
+			try
+			{
+				MessageReceived?.Invoke(m);
+			}
+			catch (Exception e)
+			{
+				Debug.LogError(e);
+			}
 		}
 
 		private void Update()
@@ -191,7 +215,7 @@ namespace VelNet
 				{
 					switch (m)
 					{
-						case ConnectedMessage connected:
+						case ConnectedMessage msg:
 						{
 							try
 							{
@@ -202,16 +226,17 @@ namespace VelNet
 							{
 								Debug.LogError(e);
 							}
+
 							break;
 						}
 						case LoginMessage lm:
 						{
 							userid = lm.userId;
-								Debug.Log("joined server " + userid);
+							Debug.Log("Joined server " + userid);
 
 							try
 							{
-									LoggedIn?.Invoke();
+								OnLoggedIn?.Invoke();
 							}
 							// prevent errors in subscribers from breaking our code
 							catch (Exception e)
@@ -221,17 +246,28 @@ namespace VelNet
 
 							//start the udp thread 
 							clientReceiveThreadUDP = new Thread(ListenForDataUDP);
-								clientReceiveThreadUDP.IsBackground = true;
 							clientReceiveThreadUDP.Start();
 
 							break;
 						}
-						case RoomsMessage rm: {
+						case RoomsMessage rm:
-								Debug.Log("Got Rooms Message");
+						{
+							Debug.Log("Got Rooms Message:\n" + rm);
+
+							try
+							{
+								RoomsReceived?.Invoke(rm);
+							}
+							// prevent errors in subscribers from breaking our code
+							catch (Exception e)
+							{
+								Debug.LogError(e);
+							}
 
 							break;
 						}
-						case JoinMessage jm: { 
+						case JoinMessage jm:
+						{
 							if (userid == jm.userId) //this is us
 							{
 								string oldRoom = LocalPlayer?.room;
@@ -260,7 +296,6 @@ namespace VelNet
 									{
 										Debug.LogError(e);
 									}
-										
 								}
 								// we just left a room
 								else
@@ -327,7 +362,18 @@ namespace VelNet
 									// TODO this may check for ownership in the future. We don't need ownership here
 									deleteObjects.ForEach(NetworkDestroy);
 
+									VelNetPlayer leftPlayer = players[jm.userId];
 									players.Remove(jm.userId);
+
+									try
+									{
+										OnPlayerLeft?.Invoke(leftPlayer);
+									}
+									// prevent errors in subscribers from breaking our code
+									catch (Exception e)
+									{
+										Debug.LogError(e);
+									}
 								}
 								else
 								{
@@ -350,10 +396,11 @@ namespace VelNet
 									}
 								}
 							}
-								break; 
 
+							break;
 						}
-						case DataMessage dm: {
+						case DataMessage dm:
+						{
 							if (players.ContainsKey(dm.senderId))
 							{
 								players[dm.senderId]?.HandleMessage(dm); //todo
@@ -364,11 +411,9 @@ namespace VelNet
 							}
 
 							break;
-
-							
 						}
-						case ChangeMasterMessage cm: {
+						case ChangeMasterMessage cm:
-
+						{
 							if (masterPlayer == null)
 							{
 								masterPlayer = players[cm.masterId];
@@ -397,7 +442,6 @@ namespace VelNet
 							}
 
 							break;
-							
 						}
 					}
 
@@ -421,7 +465,6 @@ namespace VelNet
 			try
 			{
 				clientReceiveThread = new Thread(ListenForData);
-				clientReceiveThread.IsBackground = true;
 				clientReceiveThread.Start();
 			}
 			catch (Exception e)
@@ -432,10 +475,9 @@ namespace VelNet
 
 
 		/// <summary> 	
-		/// Runs in background clientReceiveThread; Listens for incomming data. 	
+		/// Runs in background clientReceiveThread; Listens for incoming data. 	
 		/// </summary>
-		/// 
+		private static byte[] ReadExact(Stream stream, int N)
-		private byte[] ReadExact(NetworkStream stream, int N)
 		{
 			byte[] toReturn = new byte[N];
 
@@ -446,20 +488,15 @@ namespace VelNet
 				numRead += stream.Read(toReturn, numRead, numLeft);
 				numLeft = N - numRead;
 			}
+
 			return toReturn;
 		}
 
-		private int GetIntFromBytes(byte[] bytes)
+		private static int GetIntFromBytes(byte[] bytes)
 		{
-			if (BitConverter.IsLittleEndian)
+			return BitConverter.ToInt32(BitConverter.IsLittleEndian ? bytes.Reverse().ToArray() : bytes, 0);
-			{
-				return BitConverter.ToInt32(bytes.Reverse().ToArray(),0);
-			}
-			else
-			{
-				return BitConverter.ToInt32(bytes, 0);
-			}
 		}
+
 		private void ListenForData()
 		{
 			connected = true;
@@ -476,7 +513,6 @@ namespace VelNet
 				//SendToGroup("close", Encoding.UTF8.GetBytes("HelloGroup"));
 				while (true)
 				{
-					
 					// Get a stream object for reading 				
 
 
@@ -491,7 +527,6 @@ namespace VelNet
 					}
 					else if (type == 1) //rooms
 					{
-
 						RoomsMessage m = new RoomsMessage();
 						m.rooms = new List<ListedRoom>();
 						int N = GetIntFromBytes(ReadExact(stream, 4)); //the size of the payload
@@ -499,18 +534,19 @@ namespace VelNet
 						string roomMessage = Encoding.UTF8.GetString(utf8data);
 
 
-
 						string[] sections = roomMessage.Split(',');
 						foreach (string s in sections)
 						{
 							string[] pieces = s.Split(':');
-							if (pieces.Length == 2) { 
+							if (pieces.Length == 2)
+							{
 								ListedRoom lr = new ListedRoom();
 								lr.name = pieces[0];
 								lr.numUsers = int.Parse(pieces[1]);
 								m.rooms.Add(lr);
 							}
 						}
+
 						AddMessage(m);
 					}
 					else if (type == 2) //joined
@@ -521,7 +557,8 @@ namespace VelNet
 						byte[] utf8data = ReadExact(stream, N); //the room name, encoded as utf-8
 						m.room = Encoding.UTF8.GetString(utf8data);
 						AddMessage(m);
-					}else if(type == 3) //data
+					}
+					else if (type == 3) //data
 					{
 						DataMessage m = new DataMessage();
 						m.senderId = GetIntFromBytes(ReadExact(stream, 4));
@@ -532,7 +569,7 @@ namespace VelNet
 					else if (type == 4) //new master
 					{
 						ChangeMasterMessage m = new ChangeMasterMessage();
-						m.masterId = (int)GetIntFromBytes(ReadExact(stream, 4)); //sender is the new master
+						m.masterId = GetIntFromBytes(ReadExact(stream, 4)); //sender is the new master
 						AddMessage(m);
 					}
 				}
@@ -584,10 +621,12 @@ namespace VelNet
 				while (true)
 				{
 					int numReceived = udpSocket.Receive(buffer);
-					if (buffer[0] == 0)
+					switch (buffer[0])
 					{
+						case 0:
 							Debug.Log("UDP connected");
-					}else if (buffer[0] == 3)
+							break;
+						case 3:
 						{
 							DataMessage m = new DataMessage();
 							//we should get the sender address
@@ -598,6 +637,8 @@ namespace VelNet
 							Array.Copy(buffer, 5, messageBytes, 0, messageBytes.Length);
 							m.data = messageBytes;
 							AddMessage(m);
+							break;
+						}
 					}
 				}
 			}
@@ -634,7 +675,6 @@ namespace VelNet
 				NetworkStream stream = instance.socketConnection.GetStream();
 				if (stream.CanWrite)
 				{
-					
 					stream.Write(message, 0, message.Length);
 				}
 			}
@@ -652,9 +692,9 @@ namespace VelNet
 		{
 			return BitConverter.GetBytes(n).Reverse().ToArray();
 		}
+
 		public static void Login(string username, string password)
 		{
-			
 			MemoryStream stream = new MemoryStream();
 			BinaryWriter writer = new BinaryWriter(stream);
 
@@ -667,14 +707,11 @@ namespace VelNet
 			writer.Write(pB);
 
 			SendTcpMessage(stream.ToArray());
-			
-
 		}
 
 		public static void GetRooms()
 		{
-
+			SendTcpMessage(new byte[] { 1 }); //very simple message
-			SendTcpMessage(new byte[1] { 1 }); //very simple message
 		}
 
 		/// <summary>
@@ -691,14 +728,9 @@ namespace VelNet
 			writer.Write((byte)R.Length);
 			writer.Write(R);
 			SendTcpMessage(stream.ToArray());
-
-
-			
-			
 		}
 
 
-
 		/// <summary>
 		/// Leaves a room if we're in one
 		/// </summary>
@@ -785,6 +817,7 @@ namespace VelNet
 			{
 				writer.Write(get_be_bytes(client_ids[i]));
 			}
+
 			SendTcpMessage(stream.ToArray());
 		}
 
@@ -805,6 +838,7 @@ namespace VelNet
 				Debug.LogError("Can't instantiate object. Obj with that network ID was already instantiated.", instance.objects[networkId]);
 				return null;
 			}
+
 			NetworkObject newObject = Instantiate(prefab);
 			newObject.networkId = networkId;
 			newObject.prefabName = prefabName;
@@ -842,6 +876,7 @@ namespace VelNet
 				instance.objects.Remove(networkId);
 				return;
 			}
+
 			if (obj.isSceneObject)
 			{
 				instance.deletedSceneObjects.Add(networkId);

TestVelGameServer/Packages/VelNetUnity/package.json

@@ -1,7 +1,7 @@
 {
     "name": "edu.uga.engr.vel.velnet",
     "displayName": "VelNet",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "unity": "2019.1",
     "description": "A custom networking library for Unity.",
     "keywords": [

TestVelGameServer/Packages/manifest.json

@@ -2,13 +2,13 @@
   "dependencies": {
     "com.unity.collab-proxy": "1.15.7",
     "com.unity.ide.rider": "2.0.7",
-    "com.unity.ide.visualstudio": "2.0.12",
+    "com.unity.ide.visualstudio": "2.0.14",
     "com.unity.ide.vscode": "1.2.4",
     "com.unity.test-framework": "1.1.30",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.4.8",
     "com.unity.ugui": "1.0.0",
-    "edu.uga.engr.vel.velnet.dissonance": "file:c:/git_repo/VelNetDissonanceIntegration",
+    "edu.uga.engr.vel.velnet.dissonance": "https://github.com/velaboratory/VelNetDissonanceIntegration.git",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

TestVelGameServer/Packages/packages-lock.json

@@ -27,7 +27,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.12",
+      "version": "2.0.14",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -106,12 +106,13 @@
       "dependencies": {}
     },
     "edu.uga.engr.vel.velnet.dissonance": {
-      "version": "file:c:/git_repo/VelNetDissonanceIntegration",
+      "version": "https://github.com/velaboratory/VelNetDissonanceIntegration.git",
       "depth": 0,
-      "source": "local",
+      "source": "git",
       "dependencies": {
         "edu.uga.engr.vel.velnet": "1.0.4"
-      }
+      },
+      "hash": "2767cf12e6f1b5c568c44cd6f1753866ae2e6fca"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

TestVelGameServer/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.11f1
+m_EditorVersion: 2020.3.23f1
-m_EditorVersionWithRevision: 2020.3.11f1 (99c7afb366b3)
+m_EditorVersionWithRevision: 2020.3.23f1 (c5d91304a876)