Release 2.0.1

Guribo · May 25, 2024 · e859a0d · e859a0d
1 parent 5709200
commit e859a0d
Show file tree

Hide file tree

Showing 13 changed files with 71 additions and 72 deletions.
diff --git a/Packages/tlp.udonprofiling/README.md b/Packages/tlp.udonprofiling/README.md
@@ -34,6 +34,13 @@ The used pattern MAJOR.MINOR.PATCH indicates:
 
 All notable changes to this project will be documented in this file.
 
+### [2.0.1] - 2024-05-25
+
+#### ⚙️ Miscellaneous Tasks
+
+- Migrate to UdonUtils 8.0.0
+- Update demo scene
+
 ### [2.0.0] - 2024-05-16
 
 #### 🚀 Features

diff --git a/Packages/tlp.udonprofiling/Runtime/GlobalProfileHandler.asset b/Packages/tlp.udonprofiling/Runtime/GlobalProfileHandler.asset
@@ -136,7 +136,7 @@ MonoBehaviour:
       Data: 8|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.Logger.ELogLevel, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.Logger.ELogLevel, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 
@@ -325,7 +325,7 @@ MonoBehaviour:
       Data: 19|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.Logger.TlpLogger, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.Logger.TlpLogger, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 

diff --git a/Packages/tlp.udonprofiling/Runtime/GlobalProfileKickoff.asset b/Packages/tlp.udonprofiling/Runtime/GlobalProfileKickoff.asset
@@ -136,7 +136,7 @@ MonoBehaviour:
       Data: 8|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.Logger.ELogLevel, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.Logger.ELogLevel, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 
@@ -325,7 +325,7 @@ MonoBehaviour:
       Data: 19|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.Logger.TlpLogger, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.Logger.TlpLogger, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 

diff --git a/Packages/tlp.udonprofiling/Runtime/GlobalProfileKickoff.cs b/Packages/tlp.udonprofiling/Runtime/GlobalProfileKickoff.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 using TLP.UdonUtils;
-using TLP.UdonUtils.Logger;
+using TLP.UdonUtils.Runtime.Logger;
 using UdonSharp;
 using UnityEngine;
 

diff --git a/Packages/tlp.udonprofiling/Runtime/Scenes/UdonProfilingDemo.unity b/Packages/tlp.udonprofiling/Runtime/Scenes/UdonProfilingDemo.unity
@@ -904,17 +904,17 @@ PrefabInstance:
     - target: {fileID: 2012949151903506351, guid: a2e29b4f6c24d5a49851f212381a8bf5,
         type: 3}
       propertyPath: Build
-      value: 16
+      value: 17
       objectReference: {fileID: 0}
     - target: {fileID: 2012949151903506351, guid: a2e29b4f6c24d5a49851f212381a8bf5,
         type: 3}
       propertyPath: Timestamp
-      value: 1715879103
+      value: 1716647143
       objectReference: {fileID: 0}
     - target: {fileID: 2012949151903506351, guid: a2e29b4f6c24d5a49851f212381a8bf5,
         type: 3}
       propertyPath: SyncedBuild
-      value: 16
+      value: 17
       objectReference: {fileID: 0}
     - target: {fileID: 2012949151903506351, guid: a2e29b4f6c24d5a49851f212381a8bf5,
         type: 3}
@@ -924,7 +924,7 @@ PrefabInstance:
     - target: {fileID: 2012949151903506351, guid: a2e29b4f6c24d5a49851f212381a8bf5,
         type: 3}
       propertyPath: serializationData.SerializedFormat
-      value: 0
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 2103673682335936013, guid: a2e29b4f6c24d5a49851f212381a8bf5,
         type: 3}

diff --git a/Packages/tlp.udonprofiling/Runtime/Ui/PerformanceStatController.asset b/Packages/tlp.udonprofiling/Runtime/Ui/PerformanceStatController.asset
@@ -136,7 +136,7 @@ MonoBehaviour:
       Data: 8|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.Logger.ELogLevel, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.Logger.ELogLevel, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 
@@ -325,7 +325,7 @@ MonoBehaviour:
       Data: 19|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.Logger.TlpLogger, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.Logger.TlpLogger, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 
@@ -733,7 +733,7 @@ MonoBehaviour:
       Data: 45|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.DesignPatterns.MVC.Model, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.DesignPatterns.MVC.Model, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 
@@ -787,7 +787,7 @@ MonoBehaviour:
       Data: 48|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.DesignPatterns.MVC.View, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.DesignPatterns.MVC.View, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 

diff --git a/Packages/tlp.udonprofiling/Runtime/Ui/PerformanceStatController.cs b/Packages/tlp.udonprofiling/Runtime/Ui/PerformanceStatController.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics;
-using TLP.UdonUtils.DesignPatterns.MVC;
+using TLP.UdonUtils.Runtime.DesignPatterns.MVC;
 using UdonSharp;
 using UnityEngine;
 using VRC.SDKBase;
@@ -15,37 +15,29 @@ public class PerformanceStatController : Controller
         private float UpdateInterval = 1f;
 
         #region State
-
         private int _previousFrameCount;
         private bool _hasStarted;
         private float _lastUpdated;
         private float _lastIntervalDuration;
         private PerformanceStatModel _performanceStatModel;
         private readonly Stopwatch _stopwatch = new Stopwatch();
-
         #endregion
 
         #region Monobehaviour
-
-        internal void OnEnable()
-        {
-            if (!Initialized)
-            {
+        internal void OnEnable() {
+            if (!Initialized) {
                 enabled = false;
                 return;
             }
 
-            if (_hasStarted)
-            {
+            if (_hasStarted) {
                 Start();
             }
         }
 
-        public override void Start()
-        {
+        public override void Start() {
             base.Start();
-            if (!Initialized && !InitializeMvcSingleGameObject(gameObject))
-            {
+            if (!Initialized && !InitializeMvcSingleGameObject(gameObject)) {
                 Error($"Failed to initialize");
                 enabled = false;
                 return;
@@ -56,48 +48,37 @@ public override void Start()
             SendCustomEventDelayedSeconds(nameof(UpdateFrameRate), UpdateInterval);
             _hasStarted = true;
         }
-
         #endregion
 
         #region VRC
-
-        public override void OnPlayerJoined(VRCPlayerApi player)
-        {
-            if (!Initialized)
-            {
+        public override void OnPlayerJoined(VRCPlayerApi player) {
+            if (!Initialized) {
                 return;
             }
 
-            if (!Utilities.IsValid(_performanceStatModel))
-            {
+            if (!Utilities.IsValid(_performanceStatModel)) {
                 Error($"{nameof(_performanceStatModel)} invalid");
             }
 
             _performanceStatModel.Dirty = true;
             _performanceStatModel.NotifyIfDirty(1);
         }
 
-        public override void OnPlayerLeft(VRCPlayerApi player)
-        {
-            if (!Initialized)
-            {
+        public override void OnPlayerLeft(VRCPlayerApi player) {
+            if (!Initialized) {
                 return;
             }
 
             _performanceStatModel.Dirty = true;
             _performanceStatModel.NotifyIfDirty(1);
         }
-
         #endregion
 
         #region Internal
-
-        public void UpdateFrameRate()
-        {
+        public void UpdateFrameRate() {
             float currentTime = Time.timeSinceLevelLoad;
             _lastIntervalDuration = currentTime - _lastUpdated;
-            if (_lastIntervalDuration < UpdateInterval)
-            {
+            if (_lastIntervalDuration < UpdateInterval) {
                 return;
             }
 
@@ -110,12 +91,9 @@ public void UpdateFrameRate()
             int countedFrames = frameCount - _previousFrameCount;
             _performanceStatModel.CountedFrames = countedFrames;
 
-            if (countedFrames > 0)
-            {
+            if (countedFrames > 0) {
                 _performanceStatModel.AverageFrameTime = (float)(elapsedTotalMilliseconds / countedFrames);
-            }
-            else
-            {
+            } else {
                 _performanceStatModel.AverageFrameTime = 0f;
             }
 
@@ -126,8 +104,7 @@ public void UpdateFrameRate()
             SendCustomEventDelayedSeconds(nameof(UpdateFrameRate), UpdateInterval);
         }
 
-        protected override bool InitializeInternal()
-        {
+        protected override bool InitializeInternal() {
 #if TLP_DEBUG
             DebugLog(nameof(InitializeInternal));
 #endif
@@ -136,14 +113,12 @@ protected override bool InitializeInternal()
             enabled = true;
 
             bool initSuccess = Utilities.IsValid(_performanceStatModel);
-            if (initSuccess)
-            {
+            if (initSuccess) {
                 enabled = true;
             }
 
             return initSuccess;
         }
-
         #endregion
     }
 }
diff --git a/Packages/tlp.udonprofiling/Runtime/Ui/PerformanceStatModel.asset b/Packages/tlp.udonprofiling/Runtime/Ui/PerformanceStatModel.asset
@@ -136,7 +136,7 @@ MonoBehaviour:
       Data: 8|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.Logger.ELogLevel, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.Logger.ELogLevel, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 
@@ -325,7 +325,7 @@ MonoBehaviour:
       Data: 19|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.Logger.TlpLogger, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.Logger.TlpLogger, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 
@@ -733,7 +733,7 @@ MonoBehaviour:
       Data: 45|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.Events.UdonEvent, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.Events.UdonEvent, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 
@@ -1177,7 +1177,7 @@ MonoBehaviour:
       Data: 65|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: TLP.UdonUtils.Sources.TimeSource, TLP.UdonUtils.Runtime
+      Data: TLP.UdonUtils.Runtime.Sources.TimeSource, TLP.UdonUtils.Runtime
     - Name: 
       Entry: 8
       Data: 

diff --git a/Packages/tlp.udonprofiling/Runtime/Ui/PerformanceStatModel.cs b/Packages/tlp.udonprofiling/Runtime/Ui/PerformanceStatModel.cs
@@ -1,7 +1,7 @@
 using System;
-using TLP.UdonUtils.DesignPatterns.MVC;
-using TLP.UdonUtils.Sources;
-using TLP.UdonUtils.Sources.Time;
+using TLP.UdonUtils.Runtime.DesignPatterns.MVC;
+using TLP.UdonUtils.Runtime.Sources;
+using TLP.UdonUtils.Runtime.Sources.Time;
 using UdonSharp;
 using UnityEngine;
 using VRC.SDKBase;
@@ -43,12 +43,15 @@ protected override bool SetupAndValidate() {
             if (!Utilities.IsValid(RefNetworkTime)) {
                 var gameTime = NetworkTime.transform.Find("VrcTime");
                 if (!gameTime) {
-                    ErrorAndDisableGameObject($"{nameof(RefNetworkTime)} is not set and failed to find fallback 'VrcTime");
+                    ErrorAndDisableGameObject(
+                            $"{nameof(RefNetworkTime)} is not set and failed to find fallback 'VrcTime");
                     return false;
                 }
+
                 RefNetworkTime = gameTime.GetComponent<TimeSource>();
                 if (!Utilities.IsValid(RefNetworkTime)) {
-                    ErrorAndDisableGameObject($"{nameof(RefNetworkTime)} is not set and fallback is unavailable, add 'TLP_Essentials' prefab to your scene");
+                    ErrorAndDisableGameObject(
+                            $"{nameof(RefNetworkTime)} is not set and fallback is unavailable, add 'TLP_Essentials' prefab to your scene");
                     return false;
                 }
             }
@@ -66,9 +69,11 @@ public double VrcServerTime
                 if (tlpNetworkTime) {
                     return tlpNetworkTime.SampledRealServerTime;
                 }
+
                 return 0f;
             }
         }
+
         public double ServerTimeError
         {
             get
@@ -77,6 +82,7 @@ public double ServerTimeError
                 if (tlpNetworkTime) {
                     return tlpNetworkTime.ExactError;
                 }
+
                 return RefNetworkTime.TimeAsDouble() - NetworkTime.TimeAsDouble();
             }
         }
@@ -89,6 +95,7 @@ public int ServerTimeSamples
                 if (tlpNetworkTime) {
                     return tlpNetworkTime.Samples;
                 }
+
                 return -1;
             }
         }
@@ -101,9 +108,11 @@ public double CumulativeError
                 if (tlpNetworkTime) {
                     return tlpNetworkTime.AverageError;
                 }
+
                 return 0;
             }
         }
+
         public double CorrectiveDrift
         {
             get
@@ -112,6 +121,7 @@ public double CorrectiveDrift
                 if (tlpNetworkTime) {
                     return tlpNetworkTime.AverageError / tlpNetworkTime.Samples;
                 }
+
                 return 0;
             }
         }