obstacles fading in SN1

repkins · Oct 29, 2022 · 9000715 · 9000715
1 parent 3ec9db5
commit 9000715
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 20 deletions.
diff --git a/TerraformingSN1/Shims/PoolShims.cs b/TerraformingSN1/Shims/PoolShims.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Terraforming.Shims
+{
+    public static class Pool<T> where T: new()
+    {
+        public static T Get()
+        {
+            return new T();
+        }
+    }
+
+    public class ListPool<T>: IDisposable
+    {
+        private bool disposedValue;
+
+        public List<T> list = new List<T>();
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    list.Clear();
+                }
+
+                disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+    }
+}
diff --git a/TerraformingSN1/TerraformingSN1.csproj b/TerraformingSN1/TerraformingSN1.csproj
@@ -77,6 +77,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Shims\PoolShims.cs" />
     <Compile Include="Shims\TabbedControlsPanelShims.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\Identifiers.Designer.cs">

diff --git a/TerraformingShared/TerraformingShared.projitems b/TerraformingShared/TerraformingShared.projitems
@@ -21,6 +21,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\BuilderPatches.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\BuilderToolPatches.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\ConstructableBasePatches.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\HandReticleExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\PlayerToolExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\RepulsionCannonPatches.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\TerraformerExtensions.cs" />

diff --git a/TerraformingShared/Tools/BuilderExtensions.cs b/TerraformingShared/Tools/BuilderExtensions.cs
@@ -9,20 +9,24 @@ internal static class BuilderExtensions
     {
         public static void ClearConstructionObstacles(List<GameObject> results)
         {
-            results.RemoveAll(IsConstructionObstacle);
+            results.RemoveAll(IsObstacleOf<ConstructionObstacle>);
 #if !BelowZero
-            results.RemoveAll(IsImmuneToPropulsion);
+            results.RemoveAll(IsObstacleOf<ImmuneToPropulsioncannon>);
 #endif
         }
 
-        static bool IsConstructionObstacle(GameObject go)
+        static bool IsObstacleOf<T>(GameObject go)
         {
-            return go.GetComponent<ConstructionObstacle>() != null;
+            return go.GetComponent<T>() != null;
         }
 
-        static bool IsImmuneToPropulsion(GameObject go)
+        public static void GetObstacles(Vector3 position, Quaternion rotation, List<OrientedBounds> localBounds, List<GameObject> results)
         {
-            return go.GetComponent<ImmuneToPropulsioncannon>() != null;
+#if !BelowZero
+            Builder.GetObstacles(position, rotation, localBounds, results);
+#else
+            Builder.GetObstacles(position, rotation, localBounds, null, results);
+#endif
         }
     }
 }
diff --git a/TerraformingShared/Tools/BuilderToolPatches.cs b/TerraformingShared/Tools/BuilderToolPatches.cs
@@ -7,8 +7,12 @@
 using UnityEngine;
 using System.Collections;
 using System.Linq;
+using Terraforming.Tools;
+
+#if !BelowZero
+using Terraforming.Shims;
+#endif
 
-#if BelowZero
 namespace TerraformingShared.Tools
 {
     [HarmonyPatch(typeof(BuilderTool))]
@@ -84,10 +88,10 @@ public static void ShowObstaclesTooltip(Constructable constructable)
 
                 var obstaclesUseText = string.Format("{0} (Hold {1})", storedDestroyingEnabled ? disableText : enableText, uGUI.FormatButton(GameInput.Button.AltTool));
 
-                var handSubscriptText = HandReticle.main.textHandSubscript;
+                var handSubscriptText = HandReticle.main.GetHandSubscript();
                 handSubscriptText = handSubscriptText.Insert(handSubscriptText.IndexOf(Environment.NewLine), string.Format(", {0}", obstaclesUseText));
 
-                HandReticle.main.SetTextRaw(HandReticle.TextType.HandSubscript, handSubscriptText);
+                HandReticle.main.SetHandSubscriptText(handSubscriptText);
             }
         }
 
@@ -101,35 +105,38 @@ public static void OnHolster_Postfix()
 
         static void HighlightDestroyableObstacles(ConstructableBase constructableBase)
         {
+            using (var orientedBoundsListPool = Pool<ListPool<OrientedBounds>>.Get())
             using (var obstacleListPool = Pool<ListPool<GameObject>>.Get())
             {
+                var orientedBoundsList = orientedBoundsListPool.list;
                 var obstacleList = obstacleListPool.list;
 
-                using (var orientedBoundsListPool = Pool<ListPool<OrientedBounds>>.Get())
-                {
-                    var orientedBoundsList = orientedBoundsListPool.list;
-                    Builder.CacheBounds(constructableBase.gameObject.transform, constructableBase.gameObject, orientedBoundsList, false);
-                    Builder.GetObstacles(constructableBase.transform.position, constructableBase.transform.rotation, orientedBoundsList, null, obstacleList);
-                }
+                Builder.CacheBounds(constructableBase.gameObject.transform, constructableBase.gameObject, orientedBoundsList, false);
+                BuilderExtensions.GetObstacles(constructableBase.transform.position, constructableBase.transform.rotation, orientedBoundsList, obstacleList);
+
+                Terraforming.Logger.Info($"obstacleList.Count = {obstacleList.Count}");
 
                 if (obstacleList.Count > 0)
                 {
                     using (var materialListPool = Pool<ListPool<Material>>.Get())
+                    using (var rendererListPool = Pool<ListPool<Renderer>>.Get())
                     {
                         var materialList = materialListPool.list;
+                        var rendererList = rendererListPool.list;
 
                         foreach (var obstacle in obstacleList)
                         {
                             if (!(obstacle.GetComponent<BaseCell>() != null) && Builder.CanDestroyObject(obstacle))
                             {
-                                obstacle.GetComponentsInChildren(Builder.sRenderers);
+                                obstacle.GetComponentsInChildren(rendererList);
 
-                                obstacleRendererList.AddRange(Builder.sRenderers);
-                                obstacleRendererList.ForEach(r => r.fadeAmount = Config.Instance.destroyableObstacleTransparency);
+                                obstacleRendererList.AddRange(rendererList);
                             }
                         }
                     }
                 }
+
+                obstacleRendererList.ForEach(r => r.fadeAmount = Config.Instance.destroyableObstacleTransparency);
             }
         }
 
@@ -139,5 +146,4 @@ static void RestoreHighlightedObstacles()
             obstacleRendererList.Clear();
         }
     }
-}
-#endif
+}
diff --git a/TerraformingShared/Tools/HandReticleExtensions.cs b/TerraformingShared/Tools/HandReticleExtensions.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Terraforming.Tools
+{
+    internal static class HandReticleExtensions
+    {
+        public static string GetHandSubscript(this HandReticle handReticle)
+        {
+#if BelowZero
+            return handReticle.textHandSubscript;
+#else
+            return handReticle.interactText2;
+#endif
+        }
+
+        public static void SetHandSubscriptText(this HandReticle handReticle, string subscriptText)
+        {
+#if BelowZero
+            handReticle.SetTextRaw(HandReticle.TextType.HandSubscript, subscriptText);
+#else
+            handReticle.SetInteractText(handReticle.interactText1, subscriptText);
+#endif
+        }
+    }
+}