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

Merge pull request '라인 렌더러 버그 수정' (#100) from sjm/250526 into main

Browse Source 
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/100
This commit was merged in pull request #100.
This commit is contained in:
UVCXR
2025-05-26 14:26:01 +09:00
parent c463877bb1 b2cd3621fc
commit a6746e5272
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/AAA/Panel_ObjectDistance.prefab
View File

@@ -63,7 +63,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ba071beb1c8293e49a8b25d46f91a7bf, type: 3} m_Script: {fileID: 11500000, guid: ba071beb1c8293e49a8b25d46f91a7bf, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
lineThickness: 1 lineThickness: 0.1
--- !u!1 &1667491123066525069 --- !u!1 &1667491123066525069
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

1
Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs
View File

@@ -234,6 +234,7 @@ namespace Studio.AssetTool
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>(); var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
canvas_Popup.panel_objectinfo.gameObject.SetActive(false); canvas_Popup.panel_objectinfo.gameObject.SetActive(false);
componentScrollView.DeselectAll(); componentScrollView.DeselectAll();
canvas_Popup.panel_objectdistance.SetSelecetedObjectToNull();
} }
public void OrderByHierarchy(List<CustomAssetRenderObject> objectsToOrder) public void OrderByHierarchy(List<CustomAssetRenderObject> objectsToOrder)

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

@@ -16,7 +16,7 @@ namespace Studio.UI
Dictionary<UI_ObjectDistance, LineRenderer> distanceLines = new(); Dictionary<UI_ObjectDistance, LineRenderer> distanceLines = new();
[SerializeField] [SerializeField]
float lineThickness = 1; float lineThickness = 0.1f;
CustomAssetRenderObject selectedObject; CustomAssetRenderObject selectedObject;
@@ -101,7 +101,6 @@ namespace Studio.UI
distanceUI.SetText(distance); distanceUI.SetText(distance);
distanceUI.SetPos(distanceCenterPoint); distanceUI.SetPos(distanceCenterPoint);
//SetLineLength(distanceLines[distanceUI], distanceCenterPoint, direction, distance);
distanceLines[distanceUI].SetPosition(0, hitPoint); distanceLines[distanceUI].SetPosition(0, hitPoint);
distanceLines[distanceUI].SetPosition(1, hitPoint - (direction * distance)); distanceLines[distanceUI].SetPosition(1, hitPoint - (direction * distance));
distanceLines[distanceUI].enabled = true; distanceLines[distanceUI].enabled = true;
@@ -113,12 +112,5 @@ namespace Studio.UI
return; 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);
}
} }
} }