오브젝트 거리 측정 월드 좌표로 변경

Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.EventSystems;
-using System.Linq;
+using static UnityEditor.ShaderGraph.Internal.KeywordDependentCollection;
-using static XED.UI.Panel_ObjectDistance;
 
 namespace XED.Util
 {
@@ -11,6 +11,7 @@ namespace XED.Util
     {
         private GameObject renderObject;
         private MeshRenderer objectRenderer;
+        private LineRenderer lineRenderer;
         private List<Transform> snapPoints = new List<Transform>();
         private BoxCollider boxCollider;
         private Material matCubeShow;
@@ -38,6 +39,13 @@ namespace XED.Util
 
             boxCollider.gameObject.layer = LayerMask.NameToLayer("TwinObject");
             twinObjectMask = LayerMask.GetMask("TwinObject");
+
+            if (GetComponent<LineRenderer>() == null)
+            {
+                gameObject.AddComponent<LineRenderer>();
+            }
+            lineRenderer = GetComponent<LineRenderer>();
+            //lineRenderer = GetComponent<LineRenderer>() ?? gameObject.AddComponent<LineRenderer>();
         }
         // Start is called once before the first execution of Update after the MonoBehaviour is created
         void Start()
@@ -240,9 +248,23 @@ namespace XED.Util
         public RaycastHit GetObjectHit(Vector3 direction)
         {
             RaycastHit hitInfo;
-            Physics.BoxCast(boxCollider.bounds.center, boxCollider.bounds.size / 2.0f, direction, out hitInfo, transform.rotation, Mathf.Infinity, twinObjectMask);
+            Physics.BoxCast(boxCollider.bounds.center, boxCollider.size / 2.0f, direction, out hitInfo, transform.rotation, Mathf.Infinity, twinObjectMask);
 
             return hitInfo;
         }
+        /*
+        public Vector3 GetLineStartPoint(RaycastHit hit, Vector3 direction)
+        {
+            var hitObject = hit.collider;
+            if (hitObject != null)
+            {
+                return hit.point - (direction * hit.distance / 2);
+            }
+            else
+            {
+                return hit.point;
+            }
+        }
+        */
     }
 }

Assets/Scripts/Studio/Managers/EventConnector.cs

@@ -47,6 +47,7 @@ namespace XED.Manage
                 customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Popup.panel_objectinfo.gameObject.SetActive(true); });
                 customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Popup.panel_objectalign.gameObject.SetActive(true); });
                 customAssetConnector.onSelectObjects += canvas_Popup.panel_objectinfo.SetObjectInfo;
+                customAssetConnector.onSelectObjects += canvas_Popup.panel_objectdistance.Activate;
                 customAssetConnector.onRemoveObjects += canvas_Popup.panel_objectinfo.ResetObjectInfo;
                 customAssetConnector.onDeselectObjects += (() => { canvas_Popup.panel_objectinfo.gameObject.SetActive(false); });
                 customAssetConnector.onDeselectObjects += (() => { canvas_Popup.panel_objectalign.gameObject.SetActive(false); });

Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs

@@ -17,17 +17,18 @@ namespace XED.UI
 
         CustomAssetRenderObject selectedObject;
 
+
         private void Update()
         {
             if (selectedObject == null)
                 return;
 
-            UpdateDistance(Distance_up);
+            UpdateDistance(Distance_up, Vector3.up);
-            UpdateDistance(Distance_down);
+            UpdateDistance(Distance_down, Vector3.down);
-            UpdateDistance(Distance_left);
+            UpdateDistance(Distance_left, Vector3.left);
-            UpdateDistance(Distance_right);
+            UpdateDistance(Distance_right, Vector3.right);
-            UpdateDistance(Distance_foward);
+            UpdateDistance(Distance_foward, Vector3.forward);
-            UpdateDistance(Distance_back);
+            UpdateDistance(Distance_back, Vector3.back);
         }
 
         public void Activate(string name, List<GameObject> objects)
@@ -47,42 +48,29 @@ namespace XED.UI
             SetActive(false);
         }
 
-        void UpdateDistance(RectTransform rect)
+        public GameObject tmpObj;
+
+        void UpdateDistance(RectTransform rect, Vector3 direction)
         {
-            Vector3 direction;
-
-            if (rect == Distance_up)
-                direction = selectedObject.transform.up;
-            else if (rect == Distance_down)
-                direction = -selectedObject.transform.up;
-            else if (rect == Distance_left)
-                direction = -selectedObject.transform.right;
-            else if (rect == Distance_right)
-                direction = selectedObject.transform.right;
-            else if (rect == Distance_foward)
-                direction = selectedObject.transform.forward;
-            else if (rect == Distance_back)
-                direction = -selectedObject.transform.forward;
-            else return;
-
             RaycastHit hit = selectedObject.GetObjectHit(direction);
-            float distance = hit.distance;
 
-            if (distance > 0) 
+            if (hit.collider == null) 
-            {
-                rect.GetComponentInChildren<TextMeshProUGUI>().text = distance.ToString();
-
-                Vector3 hitPoint = hit.point;
-                Vector3 distanceCenterPoint = hitPoint - (direction * distance / 2);
-                Vector2 screenPoint = Camera.main.WorldToScreenPoint(distanceCenterPoint);
-                rect.transform.position = screenPoint;
-
-                rect.gameObject.SetActive(true);
-            }
-            else
             {
                 rect.gameObject.SetActive(false);
+                return;
             }
+
+            float distance = hit.distance;
+            rect.GetComponentInChildren<TextMeshProUGUI>().text = distance.ToString("F2");
+
+            Vector3 hitPoint = hit.point;
+            Vector3 distanceCenterPoint = hitPoint - (direction * distance / 2);
+            Vector2 screenPoint = Camera.main.WorldToScreenPoint(distanceCenterPoint);
+            rect.transform.position = screenPoint;
+
+            rect.gameObject.SetActive(true);
+
+            tmpObj.transform.position = hitPoint;
         }
     }
 }