Merge pull request #48 from tobeyStraitjacket/dev

SnapBuilder 1.4.1
toebeann · May 31, 2021 · 56175db · 56175db
2 parents 45e032d + e63634c
commit 56175db
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 16 deletions.
diff --git a/SnapBuilder/ColliderRecord.cs b/SnapBuilder/ColliderRecord.cs
@@ -12,7 +12,13 @@ class ColliderRecord
     {
         private static Type[] ExcludedComponentTypes { get; } = new Type[] {
             typeof(CoralBlendWhite), // default mesh is good enough and doesn't work well when upgraded
-            typeof(BaseCell)
+            typeof(BaseCell),
+            typeof(ConstructableBase)
+        };
+
+        private static TechType[] ExcludedTechTypes { get; } = new TechType[]
+        {
+            TechType.BaseHatch
         };
 
         private static Material material;
@@ -63,7 +69,7 @@ public bool IsImprovable
                 return (isImprovable = false).Value;
             }
         }
-        public bool IsImproved => Collider switch
+        public bool IsImproved => IsImprovable && Collider switch
         {
             MeshCollider meshCollider => meshCollider?.sharedMesh is Mesh mesh && mesh == ImprovedMesh,
             _ => false
@@ -80,9 +86,10 @@ public ColliderRecord(Collider collider)
         private bool IsExcluded()
         {
             Transform root = Utils.GetEntityRoot(Collider.transform.gameObject)?.transform ?? Collider.transform;
-            return ExcludedComponentTypes
-                .Select(type => root.GetComponent(type))
-                .Any(component => component is Component);
+            return ExcludedTechTypes.Contains(Builder.constructableTechType)
+                   || ExcludedComponentTypes
+                          .Select(type => root.GetComponent(type))
+                          .Any(component => component is Component);
         }
 
         public void Improve()

diff --git a/SnapBuilder/ExtensionMethods/UnityEngineExtensionMethods.cs b/SnapBuilder/ExtensionMethods/UnityEngineExtensionMethods.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Straitjacket.Subnautica.Mods.SnapBuilder.ExtensionMethods
 {
@@ -67,7 +68,24 @@ public static void Render(this Collider collider, Material material, float scale
         /// <returns></returns>
         public static Transform GetOptimalTransform(this RaycastHit hit) => Builder.GetSurfaceType(hit.normal) switch
         {
-            SurfaceType.Ground => hit.transform.parent ?? hit.transform,
+            SurfaceType.Ground when Utils.GetEntityRoot(hit.transform.gameObject)?.transform is Transform root
+                                    && root.GetComponent<BaseCell>() is BaseCell => root,
+            SurfaceType.Ground when Utils.GetEntityRoot(hit.transform.gameObject)?.transform is Transform root
+                                    && root.GetComponent<Base>() is Base => hit.transform,
+            SurfaceType.Ground when Utils.GetEntityRoot(hit.transform.gameObject)?.transform is Transform root
+                                    && new float[] { 1, 0, 1 / Mathf.Sqrt(2) }
+                                        .Any(dot => Mathf.Approximately(dot, Mathf.Abs(Vector3.Dot(root.forward, hit.transform.forward))))
+                                    => root,
+
+            SurfaceType.Ground when hit.transform.parent is Transform parent
+                                    && parent.GetComponent<BaseCell>() is BaseCell => parent,
+            SurfaceType.Ground when hit.transform.parent is Transform parent
+                                    && parent.GetComponent<Base>() is Base => hit.transform,
+            SurfaceType.Ground when hit.transform.parent is Transform parent
+                                    && new float[] { 1, 0, 1 / Mathf.Sqrt(2) }
+                                        .Any(dot => Mathf.Approximately(dot, Mathf.Abs(Vector3.Dot(parent.forward, hit.transform.forward))))
+                                    => parent,
+
             _ => hit.transform
         };
 

diff --git a/SnapBuilder/Patches/BuilderPatch.cs b/SnapBuilder/Patches/BuilderPatch.cs
@@ -24,11 +24,6 @@ public static void BeginHintsPrefix(out bool __state)
         [HarmonyPostfix]
         public static void BeginHintsPostfix(bool __state)
         {
-            if (Builder.prefab.GetComponent<ConstructableBase>() is ConstructableBase)
-            {
-                return;
-            }
-
             if (__state && Builder.rotationEnabled)
             {
                 ControlHint.Show(Lang.Hint.ToggleFineRotation, SnapBuilder.Config.FineRotation);

diff --git a/SnapBuilder/Properties/AssemblyInfo.cs b/SnapBuilder/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 // 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.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]
 [assembly: NeutralResourcesLanguage("en-GB")]
 
diff --git a/SnapBuilder/SnapBuilder.cs b/SnapBuilder/SnapBuilder.cs
@@ -111,9 +111,10 @@ public static Quaternion CalculateRotation(ref float additiveRotation, RaycastHi
             empty.transform.position = hit.point; // Set the parent transform's position to our chosen position
 
             // choose whether we should use the global forward, or the forward of the hitTransform
-            Vector3 forward = hitTransform.forward.y != 0
+            Vector3 forward = !Mathf.Approximately(Mathf.Abs(Vector3.Dot(Vector3.up, hitTransform.up)), 1)
                 && !Player.main.IsInsideWalkable()
                 && hitTransform.GetComponent<BaseCell>() is null
+                && hitTransform.GetComponent<Base>() is null
                     ? Vector3.forward
                     : hitTransform.forward;
 

diff --git a/SnapBuilder/mod_BELOWZERO.json b/SnapBuilder/mod_BELOWZERO.json
@@ -2,7 +2,7 @@
     "Id": "SnapBuilder",
     "DisplayName": "SnapBuilder",
     "Author": "Tobey Blaber",
-    "Version": "1.4",
+    "Version": "1.4.1",
     "AssemblyName": "Straitjacket.Subnautica.Mods.SnapBuilder.dll",
     "Enable": true,
     "Game": "BelowZero",

diff --git a/SnapBuilder/mod_SUBNAUTICA.json b/SnapBuilder/mod_SUBNAUTICA.json
@@ -2,7 +2,7 @@
     "Id": "SnapBuilder",
     "DisplayName": "SnapBuilder",
     "Author": "Tobey Blaber",
-    "Version": "1.4",
+    "Version": "1.4.1",
     "AssemblyName": "Straitjacket.Subnautica.Mods.SnapBuilder.dll",
     "Enable": true,
     "Game": "Subnautica",