UVCXR/Studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jmaniuvc
2025-03-26 15:23:25 +09:00
parent 65f0199ec6
commit bfc68b3d93
3 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs
View File

@@ -1,16 +1,17 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using System.Linq;
using static XED.UI.Panel_ObjectDistance;
using UnityEngine;
using UnityEngine.EventSystems;
using static UnityEditor.ShaderGraph.Internal.KeywordDependentCollection;
namespace XED.Util
{
public class CustomAssetRenderObject : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
{
private GameObject renderObject;
private MeshRenderer objectRenderer;
private MeshRenderer objectRenderer;
private LineRenderer lineRenderer;
private List<Transform> snapPoints = new List<Transform>();
private BoxCollider boxCollider;
private Material matCubeShow;
@@ -18,7 +19,7 @@ namespace XED.Util
private Material matCubeCollided;
private HashSet<GameObject> objectsInTrigger = new HashSet<GameObject>();
public System.Action onTransformChanged;
public System.Action onTransformChanged;
public Func<Bounds> getBounds;
public Func<Transform, GameObject> instantiateObject;
public bool isSelected = false;
@@ -29,7 +30,7 @@ namespace XED.Util
private void Awake()
{
objectRenderer = GetComponentInChildren<MeshRenderer>();
objectRenderer = GetComponentInChildren<MeshRenderer>();
snapPoints = GetComponentsInChildren<ObjectSnap>().Select(x => x.transform).ToList();
boxCollider = GetComponent<BoxCollider>();
matCubeShow = Resources.Load<Material>("Materials/Mat_CubeShow");
@@ -38,11 +39,18 @@ 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()
{
ResetBoundary();
ResetBoundary();
}
private void OnEnable()
{
@@ -54,8 +62,8 @@ namespace XED.Util
ClearTriggerObjects();
}
private void OnTriggerEnter(Collider other)
{
CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
{
CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
if (otherRenderObject != null)
{
isCollided = true;
@@ -65,14 +73,14 @@ namespace XED.Util
objectRenderer.material = matCubeCollided;
}
Show();
}
}
}
private void OnTriggerExit(Collider other)
{
CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
if (otherRenderObject != null)
{
objectsInTrigger.Remove(other.gameObject);
{
objectsInTrigger.Remove(other.gameObject);
}
if (objectsInTrigger.Count == 0)
{
@@ -81,7 +89,7 @@ namespace XED.Util
{
Hide();
}
}
}
}
public void OnPointerEnter(PointerEventData eventData)
{
@@ -103,14 +111,14 @@ namespace XED.Util
}
void ResetBoundary()
{
Bounds meshBounds = objectRenderer.bounds;
Bounds meshBounds = objectRenderer.bounds;
Vector3 localCenter = transform.InverseTransformPoint(meshBounds.center);
Vector3 localSize = transform.InverseTransformVector(meshBounds.size);
Vector3 localSize = transform.InverseTransformVector(meshBounds.size);
boxCollider.center = localCenter;
boxCollider.size = localSize;
}
void ClearTriggerObjects()
{
{
foreach (GameObject obj in new List<GameObject>(objectsInTrigger))
{
if (obj != null)
@@ -126,7 +134,7 @@ namespace XED.Util
if (boundary.HasValue)
{
ResizeBoundary(boundary.Value);
}
}
}
public void ResizeBoundary(Bounds meshBounds)
{
@@ -146,7 +154,7 @@ namespace XED.Util
snapPoints[5].localPosition = new Vector3(boundPointMin.x, boundPointMax.y, boundPointMax.z);
snapPoints[6].localPosition = new Vector3(boundPointMax.x, boundPointMin.y, boundPointMax.z);
snapPoints[7].localPosition = new Vector3(boundPointMax.x, boundPointMax.y, boundPointMin.z);
}
}
ResetBoundary();
}
public void Show()
@@ -180,7 +188,7 @@ namespace XED.Util
public void Select()
{
//ResizeBoundary();
isSelected = true;
isSelected = true;
objectRenderer.material = matCubeSelected;
Show();
}
@@ -197,7 +205,7 @@ namespace XED.Util
Hide();
}
public void CreateRenderObject()
{
{
if (renderObject == null)
{
renderObject = instantiateObject?.Invoke(transform);
@@ -205,7 +213,7 @@ namespace XED.Util
ResizeBoundary();
}
public void DestroyRenderObject()
{
{
if (renderObject)
{
Destroy(renderObject);
@@ -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;
}
}
*/
}
}
}

1
Assets/Scripts/Studio/Managers/EventConnector.cs
View File

@@ -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); });

60
Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs
View File

@@ -17,17 +17,18 @@ namespace XED.UI
CustomAssetRenderObject selectedObject;
private void Update()
{
if (selectedObject == null)
return;
UpdateDistance(Distance_up);
UpdateDistance(Distance_down);
UpdateDistance(Distance_left);
UpdateDistance(Distance_right);
UpdateDistance(Distance_foward);
UpdateDistance(Distance_back);
UpdateDistance(Distance_up, Vector3.up);
UpdateDistance(Distance_down, Vector3.down);
UpdateDistance(Distance_left, Vector3.left);
UpdateDistance(Distance_right, Vector3.right);
UpdateDistance(Distance_foward, Vector3.forward);
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)
{
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
if (hit.collider == null)
{
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;
}
}
}