Fixed mesh smoothing button timer incrementing too quickly when multi…

…ple characters in scene
thojmr · Jan 27, 2022 · 4e73c7a · 4e73c7a
1 parent da4a221
commit 4e73c7a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/PregnancyPlus/PregnancyPlus.Core/GUI/PPGui.ButtonTimer.cs b/PregnancyPlus/PregnancyPlus.Core/GUI/PPGui.ButtonTimer.cs
@@ -14,6 +14,8 @@ public static partial class PregnancyPlusGui
         //Appends seonds count to blendshape smoothing text operation button.  Starts incrementing timer when >= 0
         internal static int secondsCount = -1;
         internal static float timePassed = 0f;
+        //OnGui can be called multiple times per frame, make sure the count is higher before triggering again
+        internal static float lastFrameCount = 0;
 
 
         //For updating UI text over time (place in MonoBehavior Update())
@@ -22,6 +24,8 @@ public static void Update()
             //When incrementing text count, add 1 every second
             if (secondsCount >= 0)
             {
+                if (Time.frameCount <= lastFrameCount) return;
+                lastFrameCount = Time.frameCount;
                 //Keep track of the seconds passed
                 timePassed += Time.deltaTime;
 
@@ -63,6 +67,7 @@ public static void StopTextCountIncrement()
 
             secondsCount = -1;
             timePassed = 0f;
+            lastFrameCount = 0;
 
             UpdateTextComponentText();            
         }

diff --git a/PregnancyPlus/PregnancyPlus.Core/PPCharaController.cs b/PregnancyPlus/PregnancyPlus.Core/PPCharaController.cs
@@ -185,9 +185,6 @@ protected override void OnReload(GameMode currentGameMode)
 
         protected override void Update()
         {
-            //Update GUI text
-            PregnancyPlusGui.Update();
-
             //Used to inflate/deflate in main game
             WatchForUserKeyPress();
             //Used to incrementally inflate belly during HScene

diff --git a/PregnancyPlus/PregnancyPlus.Core/PPPlugin.cs b/PregnancyPlus/PregnancyPlus.Core/PPPlugin.cs
@@ -90,6 +90,9 @@ internal void OnGUI()
         {                
             if (!StudioAPI.InsideStudio) return;
 
+            //Update GUI text
+            PregnancyPlusGui.Update();
+
             //Need to trigger all children GUI that should be active. 
             var handlers = CharacterApi.GetRegisteredBehaviour(GUID);
             if (handlers == null || handlers.Instances == null) return;