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

RTG Gizmo 거리에 따른 크기 조정, UI 표현 우선순위 수정 #208

Merged
Ghost merged 3 commits from pgd/20250715_3 into main 2025-07-16 09:37:19 +09:00
Conversation 0 Commits 3 Files Changed 5 +60 -48
4 changed files with 60 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eaa4a3d48a - Show all commits

88
Assets/Scenes/0.30.0.unity
View File

@@ -4764,7 +4764,7 @@ MonoBehaviour:
_text: Scale gizmo
- _tooltip: Allows you to change universal gizmo settings.
_text: Universal gizmo
_activeTabIndex: 2
_activeTabIndex: 4
_settings:
_canBeDisplayed: 1
_isExpanded: 1
@@ -5253,13 +5253,13 @@ MonoBehaviour:
_sglSliderCapVis: 01010000
_moveGizmoLookAndFeel3D:
_canBeDisplayed: 1
_isExpanded: 0
_isExpanded: 1
_isMidCapVisible: 0
_midCapLookAndFeel:
_capType: 2
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -5299,7 +5299,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -5316,7 +5316,7 @@ MonoBehaviour:
_capType: 0
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -5339,7 +5339,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -5356,7 +5356,7 @@ MonoBehaviour:
_capType: 0
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -5379,7 +5379,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -5396,7 +5396,7 @@ MonoBehaviour:
_capType: 0
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -5419,7 +5419,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -5436,7 +5436,7 @@ MonoBehaviour:
_capType: 0
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -5459,7 +5459,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -5476,7 +5476,7 @@ MonoBehaviour:
_capType: 0
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -5499,7 +5499,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -5516,7 +5516,7 @@ MonoBehaviour:
_capType: 0
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -5537,7 +5537,7 @@ MonoBehaviour:
_hoveredColor: {r: 0.96470594, g: 0.9490197, b: 0.19607845, a: 1}
_dblSlidersLookAndFeel:
- _planeType: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_quadWidth: 1.5
_quadHeight: 1.5
@@ -5568,7 +5568,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_quadWidth: 1.5
_quadHeight: 1.5
@@ -5599,7 +5599,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_quadWidth: 1.5
_quadHeight: 1.5
@@ -5633,7 +5633,7 @@ MonoBehaviour:
_canBeDisplayed: 1
_isExpanded: 1
_enable2DMode:
_isEnabled: 1
_isEnabled: 0
_key: 0
_lCtrl: 0
_lCmd: 0
@@ -5755,13 +5755,13 @@ MonoBehaviour:
_scaleSensitivity: 1
_rotationGizmoLookAndFeel3D:
_canBeDisplayed: 1
_isExpanded: 0
_isExpanded: 1
_isMidCapVisible: 1
_midCapLookAndFeel:
_capType: 3
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -5783,7 +5783,7 @@ MonoBehaviour:
_axesVis: 010101
_axesLookAndFeel:
- _planeType: 2
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_quadWidth: 1
_quadHeight: 1
@@ -5814,7 +5814,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 2
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_quadWidth: 1
_quadHeight: 1
@@ -5845,7 +5845,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 2
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_quadWidth: 1
_quadHeight: 1
@@ -6039,12 +6039,12 @@ MonoBehaviour:
_scaleSensitivity: 1
_scaleGizmoLookAndFeel3D:
_canBeDisplayed: 1
_isExpanded: 0
_isExpanded: 1
_midCapLookAndFeel:
_capType: 2
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -6078,7 +6078,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -6095,7 +6095,7 @@ MonoBehaviour:
_capType: 2
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -6118,7 +6118,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -6135,7 +6135,7 @@ MonoBehaviour:
_capType: 2
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -6158,7 +6158,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -6175,7 +6175,7 @@ MonoBehaviour:
_capType: 2
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -6198,7 +6198,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -6215,7 +6215,7 @@ MonoBehaviour:
_capType: 2
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -6238,7 +6238,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -6255,7 +6255,7 @@ MonoBehaviour:
_capType: 2
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -6278,7 +6278,7 @@ MonoBehaviour:
_lineType: 0
_fillMode: 0
_length: 5.5
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_boxHeight: 0.18
_boxDepth: 0.18
@@ -6295,7 +6295,7 @@ MonoBehaviour:
_capType: 2
_fillMode: 0
_shadeMode: 0
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_coneHeight: 1.65
_coneRadius: 0.5
@@ -6316,7 +6316,7 @@ MonoBehaviour:
_hoveredColor: {r: 0.96470594, g: 0.9490197, b: 0.19607845, a: 1}
_dblSlidersLookAndFeel:
- _planeType: 1
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_quadWidth: 1
_quadHeight: 1
@@ -6347,7 +6347,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 1
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_quadWidth: 1
_quadHeight: 1
@@ -6378,7 +6378,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 1
_scale: 1
_scale: 1.2
_useZoomFactor: 1
_quadWidth: 1
_quadHeight: 1
@@ -11041,7 +11041,7 @@ Canvas:
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_SortingOrder: 2
m_TargetDisplay: 0
--- !u!1 &3194360978488024824
GameObject:
@@ -11664,6 +11664,10 @@ PrefabInstance:
propertyPath: m_Name
value: Panel_Toolbox
objectReference: {fileID: 0}
- target: {fileID: 1799883531746712332, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3012754740992037236, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3}
propertyPath: m_AnchoredPosition.x
value: 258.89844

4
Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs
View File

@@ -13,10 +13,10 @@ namespace Studio.Manage
GameObject hierarchyWindow = canvas_Popup.panel_hierarchy.gameObject;
GameObject interferedobjectlistWindow = canvas_Popup.panel_interferedobjectlist.gameObject;
GameObject assetLibraryWindow = canvas_Popup.panel_assetlibrary.gameObject;
Panel_AssetLibrary assetLibraryWindow = canvas_Popup.panel_assetlibrary;
GameObject repository = canvas_Popup.panel_datarepository.gameObject;
canvas_static.panel_studiotopbar.onClickAssetLibraryWindow += (() => assetLibraryWindow.SetActive(true));
canvas_static.panel_studiotopbar.onClickAssetLibraryWindow += assetLibraryWindow.Open;
canvas_static.panel_studiotopbar.onClickHierarchyWindow += (() => hierarchyWindow.SetActive(true));
canvas_static.panel_studiotopbar.onClickDataStorage += (() => repository.SetActive(true));
}

14
Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs
View File

@@ -1,8 +1,8 @@
using UnityEngine;
using XRLib.UI;
using Studio.HierarchyTree;
using UnityEngine.UI;
using Studio.AssetLibraryTree;
using Studio.HierarchyTree;
using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace Studio.UI
{
@@ -23,6 +23,12 @@ namespace Studio.UI
Button_Close.onClick.AddListener(OnClickClose);
}
public void Open()
{
gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling();
}
private void OnClickClose()
{
scrollView.DeselectAll();

2
Assets/Scripts/Studio/UI/Panel/Panel_Start.cs
View File

@@ -1,3 +1,4 @@
using Studio.Manage;
using System;
using TMPro;
using UnityEngine;
@@ -60,6 +61,7 @@ namespace Studio.UI
public void Close()
{
CanvasManager.instance.GetCanvas<Canvas_Static>().panel_toolbox.SetActive(true);
SetActive(false);
}
}