Network optimizations

Author: vanZeben

BeatSaberOnline/Controllers/AvatarController.cs

@@ -132,9 +132,9 @@ void Update()
             {
                 if (avatar != null && !forcePlayerInfo)
                 {
-                    if (GameController.Tickrate < (1f / Time.smoothDeltaTime))
+                    if (GameController.TPS < (1f / Time.smoothDeltaTime))
                     {
-                        interpolationProgress += Time.deltaTime * GameController.Tickrate;
+                        interpolationProgress += Time.deltaTime * GameController.TPS;
                     }
                     else
                     {

BeatSaberOnline/Controllers/GameController.cs

@@ -1,19 +1,12 @@
 using BeatSaberOnline.Data;
-using BeatSaberOnline.Data.Steam;
 using BeatSaberOnline.Utils;
 using BeatSaberOnline.Views.Menus;
-using CustomAvatar;
-using CustomUI.Utilities;
-using Steamworks;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using UnityEngine.XR;
 using VRUI;
 using Logger = BeatSaberOnline.Data.Logger;
 using SteamAPI = BeatSaberOnline.Data.Steam.SteamAPI;
@@ -23,11 +16,38 @@ namespace BeatSaberOnline.Controllers
     class GameController : MonoBehaviour
     {
         public static GameController Instance;
-        public static float TPS { get; } = 25f / 1000f;
-        public static float Tickrate { get; } = 1000f / TPS;
+        public static float TPS
+        {
+            get
+            {
+                float tps = 0;
+                switch (Config.Instance.NetworkQuality)
+                {
+                    case 0:
+                        tps = 5;
+                        break;
+                    case 1:
+                        tps = 10;
+                        break;
+                    case 2:
+                        tps = 15;
+                        break;
+                    case 3:
+                        tps = 20;
+                        break;
+                    case 4:
+                        tps = 25;
+                        break;
+                    case 5:
+                        tps = 30;
+                        break;
+                }
+                return 1f / tps;
+            }
+        }
         private ResultsViewController _resultsViewController;
         private string _currentScene;
-
+        
         public static void Init(Scene to)
         {
             if (Instance != null)

BeatSaberOnline/Controllers/PlayerController.cs

@@ -50,7 +50,7 @@ public void Awake()
 
             }
         }
-        private bool isBroadcasting = false;
+        public bool isBroadcasting = false;
         public void StartBroadcasting()
         {
             if (isBroadcasting) { return; }
@@ -136,7 +136,7 @@ public void UpsertPlayer(PlayerInfo info)
                 if (!_connectedPlayers.Keys.Contains(info.playerId))
                 {
                     _connectedPlayers.Add(info.playerId, info);
-                    if (Config.Instance.AvatarsInLobby)
+                    if ((Config.Instance.AvatarsInLobby && Plugin.instance.CurrentScene == "Menu") || (Config.Instance.AvatarsInGame && Plugin.instance.CurrentScene == "GameCore"))
                     {
                         AvatarController avatar = new GameObject("AvatarController").AddComponent<AvatarController>();
                         avatar.SetPlayerInfo(info, new Vector3(0, 0, 0), info.playerId == _playerInfo.playerId);
@@ -154,7 +154,7 @@ public void UpsertPlayer(PlayerInfo info)
                         Scoreboard.Instance.UpsertScoreboardEntry(info.playerId, info.playerName, (int)info.playerScore, (int)info.playerComboBlocks);
                         MultiplayerLobby.RefreshScores();
                     }
-                    if (Config.Instance.AvatarsInLobby)
+                    if (_connectedPlayerAvatars.ContainsKey(info.playerId) && (Config.Instance.AvatarsInLobby && Plugin.instance.CurrentScene == "Menu") || (Config.Instance.AvatarsInGame && Plugin.instance.CurrentScene == "GameCore"))
                     {
                         Vector3 offset = new Vector3(0, 0, 0);
                         if (Plugin.instance.CurrentScene == "GameCore")
@@ -163,7 +163,7 @@ public void UpsertPlayer(PlayerInfo info)
                             playerInfosByID[0] = _playerInfo.playerId;
                             _connectedPlayers.Keys.ToList().CopyTo(playerInfosByID, 1);
                             Array.Sort(playerInfosByID);
-                            offset = new Vector3((Array.IndexOf(playerInfosByID, info.playerId) - Array.IndexOf(playerInfosByID, _playerInfo.playerId)) * 3f, 0, Math.Abs((Array.IndexOf(playerInfosByID, info.playerId) - Array.IndexOf(playerInfosByID, _playerInfo.playerId)) * 3f));
+                            offset = new Vector3((Array.IndexOf(playerInfosByID, info.playerId) - Array.IndexOf(playerInfosByID, _playerInfo.playerId)) * 2.5f, 0, Math.Abs((Array.IndexOf(playerInfosByID, info.playerId) - Array.IndexOf(playerInfosByID, _playerInfo.playerId)) * 2f));
                         }
 
                         _connectedPlayerAvatars[info.playerId].SetPlayerInfo(info, offset, info.playerId == _playerInfo.playerId);
@@ -212,6 +212,7 @@ void BroadcastPlayerInfo()
         {
             try
             {
+                Data.Logger.Info("Broadcasting");
                 UpdatePlayerInfo();
                 SteamAPI.SendPlayerInfo(_playerInfo);
                 if (_playerInfo.voip != null && _playerInfo.voip.Length > 0)

BeatSaberOnline/Data/Steam/SteamAPI.cs

@@ -564,13 +564,13 @@ public static void Disconnect()
                 Controllers.PlayerController.Instance.StopBroadcasting();
                 _lobbyInfo.HostName = "";
                 SendLobbyInfo(true);
-                
+
                 Connection = ConnectionState.DISCONNECTED;
                 SteamMatchmaking.LeaveLobby(_lobbyInfo.LobbyID);
                 Controllers.PlayerController.Instance.DestroyAvatars();
+                WaitingMenu.firstInit = true;
                 WaitingMenu.queuedSong = null;
                 _lobbyInfo = new LobbyInfo();
-                userID = 0;
                 UpdateUserInfo();
                 Scoreboard.Instance.RemoveAll();
                 SongListUtils.InSong = false;

BeatSaberOnline/Plugin.cs

@@ -13,7 +13,7 @@ public class Plugin : IPlugin
     {
         public static Plugin instance;
         public string Name => "BeatSaberOnline";
-        public string Version => "1.0.2";
+        public string Version => "1.0.3";
         public string UpdatedVersion { get; set; }
         public string CurrentScene { get; set; }
 

BeatSaberOnline/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2")]
-[assembly: AssemblyFileVersion("1.0.2")]
+[assembly: AssemblyVersion("1.0.3")]
+[assembly: AssemblyFileVersion("1.0.3")]

BeatSaberOnline/Utils/Config.cs

@@ -12,6 +12,9 @@ public class Config
         private bool _noFailMode;
         private bool _debugMode;
         private bool _avatarsInLobby;
+        private bool _avatarsInGame;
+        private int _networkQuality;
+
         private static Config _instance;
 
         private static FileInfo FileLocation { get; } = new FileInfo($"./UserData/{Plugin.instance.Name}.json");
@@ -135,6 +138,28 @@ public bool AvatarsInLobby
         }
 
 
+        public bool AvatarsInGame
+        {
+            get { return _avatarsInGame; }
+            set
+            {
+                _avatarsInGame = value;
+                MarkDirty();
+            }
+        }
+
+
+        public int NetworkQuality
+        {
+            get { return _networkQuality; }
+            set
+            {
+                if (value > 5) { value = 5; }
+                _networkQuality = value;
+                MarkDirty();
+            }
+        }
+        
         Config()
         {
             _autoStartLobby = false;
@@ -143,6 +168,8 @@ public bool AvatarsInLobby
             _noFailMode = true;
             _debugMode = false;
             _avatarsInLobby = true;
+            _avatarsInGame = true;
+            _networkQuality = 3;
             IsDirty = true;
         }
 

BeatSaberOnline/Views/Menus/MultiplayerLobby.cs

@@ -91,7 +91,7 @@ public static void Init()
                                         Logger.Error(e);
                                     }
                                 });
-                                var t = middleViewController.CreateText("You can use Party in the Main Menu to choose songs for your lobby. \n\nYou can also control all the default Game Modifiers for the lobby through the Party Menu as well.", new Vector2(0, BASE.y - 10f));
+                                var t = middleViewController.CreateText("You can use Online Lobby in the Main Menu to choose songs for your lobby. \n\nYou can also control all the default Game Modifiers for the lobby through the Online Lobby Menu as well.", new Vector2(0, BASE.y - 10f));
                                 var tt = middleViewController.CreateText("If something goes wrong, click the disconnect button above and just reconnect to the lobby.", new Vector2(0, 0 - BASE.y));
                                 t.alignment = TMPro.TextAlignmentOptions.Center;
                                 tt.alignment = TMPro.TextAlignmentOptions.Center;

BeatSaberOnline/Views/PluginUI.cs

@@ -104,10 +104,27 @@ private void CreateSettingsMenu()
                 Config.Instance.MaxLobbySize = value;
             };
 
-            var AvatarsInLobby = settingsMenu.AddBool("Enable Avatars");
+            var AvatarsInLobby = settingsMenu.AddBool("Enable Avatars In Lobby");
             AvatarsInLobby.GetValue += delegate { return Config.Instance.AvatarsInLobby; };
             AvatarsInLobby.SetValue += delegate (bool value) { Config.Instance.AvatarsInLobby = value; };
 
+            var AvatarsInGame = settingsMenu.AddBool("Enable Avatars In Game");
+            AvatarsInGame.GetValue += delegate { return Config.Instance.AvatarsInGame; };
+            AvatarsInGame.SetValue += delegate (bool value) { Config.Instance.AvatarsInGame = value; };
+
+
+            var NetworkQuality = settingsMenu.AddInt("Network Quality", 0, 5, 1);
+            NetworkQuality.GetValue += delegate { return Config.Instance.NetworkQuality; };
+            NetworkQuality.SetValue += delegate (int value) {
+                Config.Instance.NetworkQuality = value;
+                if (Controllers.PlayerController.Instance.isBroadcasting)
+                {
+                    Controllers.PlayerController.Instance.StopBroadcasting();
+                    Controllers.PlayerController.Instance.StartBroadcasting();
+                }
+            };
+
+
             var DebugMode = settingsMenu.AddBool("Debug Mode");
             DebugMode.GetValue += delegate { return Config.Instance.DebugMode; };
             DebugMode.SetValue += delegate (bool value) { Config.Instance.DebugMode = value; };