Compare commits

...

4 Commits

Author SHA1 Message Date
jmaniuvc
110b2f87ed 거리 UI z값 버그 수정 2025-03-26 17:01:11 +09:00
jmaniuvc
eee79d1145 거리 Line 표시 2025-03-26 16:45:35 +09:00
jmaniuvc
bfc68b3d93 오브젝트 거리 측정 월드 좌표로 변경 2025-03-26 15:23:25 +09:00
jmaniuvc
65f0199ec6 거리 UI 2025-03-25 18:33:49 +09:00
11 changed files with 1603 additions and 26 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e34354bad51342e4ca9569fd37c9b8dd
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,88 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5879261464688472025
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5472984000651998200}
- component: {fileID: 9157913964040327910}
- component: {fileID: 1305656563587261426}
m_Layer: 0
m_Name: PRF_ObjectDistanceLine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5472984000651998200
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5879261464688472025}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &9157913964040327910
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5879261464688472025}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1305656563587261426
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5879261464688472025}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 4f1ef37ae953c484bbc5d5e4049147e5, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 06e21ad3a6d17614a8d74d9cc974d7f9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,15 +1,16 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using System.Linq;
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 List<Transform> snapPoints = new List<Transform>();
private BoxCollider boxCollider;
private Material matCubeShow;
@@ -17,26 +18,31 @@ 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;
public bool isCollided = false;
private float zFightingOffset = 1.0001f;
LayerMask twinObjectMask;
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");
matCubeSelected = Resources.Load<Material>("Materials/Mat_CubeSelected");
matCubeCollided = Resources.Load<Material>("Materials/Mat_CubeCollided");
boxCollider.gameObject.layer = LayerMask.NameToLayer("TwinObject");
twinObjectMask = LayerMask.GetMask("TwinObject");
}
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
ResetBoundary();
ResetBoundary();
}
private void OnEnable()
{
@@ -48,8 +54,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;
@@ -59,14 +65,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)
{
@@ -75,7 +81,7 @@ namespace XED.Util
{
Hide();
}
}
}
}
public void OnPointerEnter(PointerEventData eventData)
{
@@ -97,14 +103,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)
@@ -120,7 +126,7 @@ namespace XED.Util
if (boundary.HasValue)
{
ResizeBoundary(boundary.Value);
}
}
}
public void ResizeBoundary(Bounds meshBounds)
{
@@ -140,7 +146,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()
@@ -174,7 +180,7 @@ namespace XED.Util
public void Select()
{
//ResizeBoundary();
isSelected = true;
isSelected = true;
objectRenderer.material = matCubeSelected;
Show();
}
@@ -191,7 +197,7 @@ namespace XED.Util
Hide();
}
public void CreateRenderObject()
{
{
if (renderObject == null)
{
renderObject = instantiateObject?.Invoke(transform);
@@ -199,7 +205,7 @@ namespace XED.Util
ResizeBoundary();
}
public void DestroyRenderObject()
{
{
if (renderObject)
{
Destroy(renderObject);
@@ -230,5 +236,13 @@ namespace XED.Util
if (renderObject == null) return null;
return new KDTree(renderObject);
}
public RaycastHit GetObjectHit(Vector3 direction)
{
RaycastHit hitInfo;
Physics.BoxCast(boxCollider.bounds.center, boxCollider.size / 2.0f, direction, out hitInfo, transform.rotation, Mathf.Infinity, twinObjectMask);
return hitInfo;
}
}
}
}

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.ActivateFromSelect;
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); });

View File

@@ -1,5 +1,4 @@
using Newtonsoft.Json;
using System;
using UnityEngine;
using XED.Attributes;
using XED.UI;
@@ -30,8 +29,9 @@ namespace XED
physics.Init(this);
metaData.Init(this);
panel_InterferedObjectList = FindSingle<Panel_InterferedObjectList>();
panel_InterferedObjectList = FindSingle<Panel_InterferedObjectList>();
}
public void Binding(IEntity entity)
{
this.entity = entity;
@@ -80,6 +80,5 @@ namespace XED
panel_InterferedObjectList.RemoveContentButton(this, contracter);
}
}
}

View File

@@ -25,6 +25,7 @@ namespace XED
public Panel_DragHandler panel_draghandler;
public Panel_AssetEdit panel_assetedit;
public Panel_Thumbnail panel_thumbnail;
public Panel_ObjectDistance panel_objectdistance;
public override void AfterAwake()
{

View File

@@ -0,0 +1,120 @@
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using XED.Util;
using XRLib.UI;
namespace XED.UI
{
public class Panel_ObjectDistance : PanelBase
{
GameObject linePrefab;
RectTransform Distance_up;
RectTransform Distance_down;
RectTransform Distance_left;
RectTransform Distance_right;
RectTransform Distance_foward;
RectTransform Distance_back;
Dictionary<RectTransform, GameObject> distanceLines = new();
[SerializeField]
float lineThickness = 1;
CustomAssetRenderObject selectedObject;
public override void AfterAwake()
{
linePrefab = Resources.Load<GameObject>("Prefabs/PRF_ObjectDistanceLine");
distanceLines.Add(Distance_up, Instantiate(linePrefab));
distanceLines.Add(Distance_down, Instantiate(linePrefab));
distanceLines.Add(Distance_left, Instantiate(linePrefab));
distanceLines.Add(Distance_right, Instantiate(linePrefab));
distanceLines.Add(Distance_foward, Instantiate(linePrefab));
distanceLines.Add(Distance_back, Instantiate(linePrefab));
foreach (var rect in distanceLines.Keys)
{
rect.gameObject.SetActive(false);
distanceLines[rect].gameObject.SetActive(false);
}
}
private void Update()
{
if (selectedObject == null)
return;
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(GameObject obj)
{
selectedObject = obj.GetComponent<CustomAssetRenderObject>();
}
public void ActivateFromSelect(string name, List<GameObject> objects)
{
if (objects.Count != 1)
{
Deactivate();
return;
}
selectedObject = objects[0].GetComponent<CustomAssetRenderObject>();
SetActive(true);
}
public void Deactivate()
{
SetActive(false);
}
void UpdateDistance(RectTransform rect, Vector3 direction)
{
RaycastHit hit = selectedObject.GetObjectHit(direction);
if (hit.collider != null)
{
float distance = hit.distance;
rect.GetComponentInChildren<TextMeshProUGUI>().text = distance.ToString("F2");
Vector3 hitPoint = hit.point;
Vector3 distanceCenterPoint = hitPoint - (direction * distance / 2);
Vector3 screenPoint = Camera.main.WorldToScreenPoint(distanceCenterPoint);
rect.transform.position = screenPoint;
if (screenPoint.z > 0)
{
rect.gameObject.SetActive(true);
}
else
{
rect.gameObject.SetActive(false);
}
SetLineLength(distanceLines[rect], distanceCenterPoint, direction, distance);
distanceLines[rect].SetActive(true);
}
else
{
rect.gameObject.SetActive(false);
distanceLines[rect].SetActive(false);
return;
}
}
void SetLineLength(GameObject line, Vector3 centerPoint, Vector3 direction, float length)
{
line.transform.position = centerPoint;
line.transform.rotation = Quaternion.LookRotation(direction) * Quaternion.Euler(new Vector3(90, 0, 0));
line.transform.localScale = new Vector3(lineThickness, length / 2, lineThickness);
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: ba071beb1c8293e49a8b25d46f91a7bf

View File

@@ -18,7 +18,7 @@ TagManager:
- Voxel
- obstacle
- objectSnap
-
- TwinObject
-
-
-