Merge pull request #298 from Netherlands3D/fix/ensure-obj-is-at-same-…

…location-after-save

Make sure the position of an imported 3d model doesn't overwrite a po…

Assets/Scripts/Layers/LayerTypes/ObjSpawner.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -20,6 +21,11 @@ public class ObjSpawner : MonoBehaviour, ILayerWithPropertyData
 
         private ObjImporter.ObjImporter importer;
 
+        private void Awake()
+        {
+            gameObject.transform.position = ObjectPlacementUtility.GetSpawnPoint();
+        }
+
         private void Start()
         {
             StartImport();
@@ -68,8 +74,10 @@ private void ImportObj(string path)
 
         private void OnObjImported(GameObject returnedGameObject)
         {
+            // By explicitly stating the worldPositionStays to false, we ensure Obj is spawned and it will retain the
+            // position and scale in this parent object
             returnedGameObject.transform.SetParent(this.transform, false);
-            AddLayerScriptToObj(returnedGameObject);
+            returnedGameObject.AddComponent<MeshCollider>();
 
             DisposeImporter();
         }
@@ -78,16 +86,5 @@ private void DisposeImporter()
         {
             if (importer != null) Destroy(importer.gameObject);
         }
-
-        private void AddLayerScriptToObj(GameObject parsedObj)
-        {
-            var spawnPoint = ObjectPlacementUtility.GetSpawnPoint();
-
-            gameObject.transform.position = spawnPoint;
-
-            parsedObj.AddComponent<MeshCollider>();
-
-            // CreatedMoveableGameObject.Invoke(parsedObj);
-        }
     }
 }

Assets/Scripts/ObjectPlacementUtility.cs

@@ -7,14 +7,16 @@ public static class ObjectPlacementUtility
         public static Vector3 GetSpawnPoint()
         {
             var camera = Camera.main;
-            var ray = camera.ScreenPointToRay(new Vector2(Screen.width / 2, Screen.height / 2));
+            var cameraTransform = camera.transform;
+
+            var ray = camera.ScreenPointToRay(new Vector2(Screen.width * .5f, Screen.height * .5f));
             var plane = new Plane(Vector3.up, 0);
-            var intersect = plane.Raycast(ray, out float distance);
-            if (!intersect)
+            if (plane.Raycast(ray, out var distance) == false)
+            {
                 distance = 10f;
+            }
 
-            var spawnPoint = camera.transform.position + camera.transform.forward * distance;
-            return spawnPoint;
+            return cameraTransform.position + cameraTransform.forward * distance;
         }
     }
 }