khi/XRLib
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Studio Setting 완료

Browse Source
This commit is contained in:
logonkhi
2025-12-16 20:31:27 +09:00
parent b5fdf7faeb
commit cfd7573ffe
9 changed files with 200 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Assets/Scripts/Studio/Modal/Settings/SettingDatabaseTabContent.cs
View File

@@ -30,22 +30,22 @@ namespace UVC.Studio.Modal.Settings
private bool changedValue = false;
// Tab 키 포커스 이동을 위한 InputField 배열
private TMP_InputField?[] inputFields = null!;
/// <summary>
/// 탭 콘텐츠에 데이터를 전달합니다.
/// </summary>
/// <param name="data">전달할 데이터 객체</param>
public async void SetContentData(object? data)
{
Debug.Log($"SettingDatabaseTabContent SetContentData: {data} {setting == null}");
if (setting == null)
{
// Start 전에 호출 되서 Injection 완료 대기 후 Setting 인스턴스 획득
await InjectorAppContext.Instance.WaitForInitializationAsync();
setting = InjectorAppContext.Instance.Get<Setting>();
}
Debug.Log($"SettingDatabaseTabContent SetContentData: {data} {setting == null}");
if (setting != null)
{
changedValue = false;
@@ -91,9 +91,45 @@ namespace UVC.Studio.Modal.Settings
});
}
// Tab 키 포커스 이동을 위한 배열 초기화
inputFields = new TMP_InputField?[] { ipTxt, portTxt, idTxt, pwTxt };
}
}
private void Update()
{
// Tab 키 입력 처리
if (Input.GetKeyDown(KeyCode.Tab) && inputFields != null)
{
int currentIndex = GetCurrentFocusedIndex();
if (currentIndex >= 0)
{
int nextIndex = Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift)
? (currentIndex - 1 + inputFields.Length) % inputFields.Length // Shift+Tab: 이전
: (currentIndex + 1) % inputFields.Length; // Tab: 다음
if (inputFields[nextIndex] != null)
{
inputFields[nextIndex]!.Select();
}
}
}
}
private int GetCurrentFocusedIndex()
{
if (inputFields == null) return -1;
for (int i = 0; i < inputFields.Length; i++)
{
if (inputFields[i] != null && inputFields[i]!.isFocused)
{
return i;
}
}
return -1;
}
/// <summary>
/// 탭 전환 시 데이터가 있는 경우 전달 되는 데이터. SetContentData 이후 호출 됨
/// </summary>

74
Assets/Scripts/Studio/Modal/Settings/SettingGeneralTabContent.cs
View File

@@ -1,5 +1,6 @@
#nullable enable
using Cysharp.Threading.Tasks;
using RTGLite;
using TMPro;
using UnityEngine;
using UVC.Core;
@@ -31,16 +32,25 @@ namespace UVC.Studio.Modal.Settings
private bool changedValue = false;
// Tab 키 포커스 이동을 위한 InputField 배열
private TMP_InputField?[] inputFields = null!;
private int autoSaveInterval = -1;
private float gridSize = -1f;
private float snapPosition = -1f;
private float snapRotation = -1f;
private float snapScale = -1f;
/// <summary>
/// 탭 콘텐츠에 데이터를 전달합니다.
/// </summary>
/// <param name="data">전달할 데이터 객체</param>
public async void SetContentData(object? data)
{
Debug.Log($"SettingGeneralTabContent SetContentData: {data}");
if (setting == null)
{
// Start 전에 호출 되서 Injection 완료 대기 후 Setting 인스턴스 획득
await InjectorAppContext.Instance.WaitForInitializationAsync();
setting = InjectorAppContext.Instance.Get<Setting>();
}
@@ -50,6 +60,12 @@ namespace UVC.Studio.Modal.Settings
changedValue = false;
GeneralSetting general = setting.Data.general;
autoSaveInterval = general.autoSaveInterval;
gridSize = general.gridSize;
snapPosition = general.snapPosition;
snapRotation = general.snapRotation;
snapScale = general.snapScale;
if (autoSaveValueTxt != null)
{
autoSaveValueTxt.text = general.autoSaveInterval.ToString();
@@ -75,9 +91,55 @@ namespace UVC.Studio.Modal.Settings
ScaleSnapValueTxt.text = general.snapScale.ToString();
ScaleSnapValueTxt.onEndEdit.AddListener(onChagedTextScaleSnap);
}
// Tab 키 포커스 이동을 위한 배열 초기화
inputFields = new TMP_InputField?[] {
autoSaveValueTxt,
gridValueTxt,
positionSnapValueTxt,
RotationSnapValueTxt,
ScaleSnapValueTxt
};
}
}
private void Update()
{
// Tab 키 입력 처리
if (Input.GetKeyDown(KeyCode.Tab) && inputFields != null)
{
int currentIndex = GetCurrentFocusedIndex();
if (currentIndex >= 0)
{
int nextIndex = Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift)
? (currentIndex - 1 + inputFields.Length) % inputFields.Length // Shift+Tab: 이전
: (currentIndex + 1) % inputFields.Length; // Tab: 다음
if (inputFields[nextIndex] != null)
{
inputFields[nextIndex]!.Select();
}
}
}
}
/// <summary>
/// 현재 포커스된 InputField의 인덱스를 반환합니다.
/// </summary>
private int GetCurrentFocusedIndex()
{
if (inputFields == null) return -1;
for (int i = 0; i < inputFields.Length; i++)
{
if (inputFields[i] != null && inputFields[i]!.isFocused)
{
return i;
}
}
return -1;
}
private void onChagedTextAutoSave(string value)
{
if (setting != null && int.TryParse(value, out int intValue))
@@ -93,6 +155,11 @@ namespace UVC.Studio.Modal.Settings
{
setting.Data.general.gridSize = floatValue;
changedValue = true;
if (setting.Data.general.gridSize != gridSize)
{
RTGrid.get.settings.cellSize = new Vector3(setting.Data.general.gridSize, setting.Data.general.gridSize, setting.Data.general.gridSize);
}
}
}
@@ -149,6 +216,11 @@ namespace UVC.Studio.Modal.Settings
Debug.Log($"SettingGeneralTabContent OnCloseAsync: changedValue={changedValue} setting == null:{setting == null}");
if (setting != null && setting.Data.general.gridSize != gridSize)
{
RTGrid.get.settings.cellSize = new Vector3(setting.Data.general.gridSize, setting.Data.general.gridSize, setting.Data.general.gridSize);
}
if(changedValue && setting != null)
{
await setting.SaveAsync();

4
Assets/Scripts/Studio/Modal/Settings/SettingModal.cs
View File

@@ -65,11 +65,11 @@ namespace UVC.Studio.Modal.Settings
if (parts.Length > 0)
{
//시간차를 계산해 0.5초 후에 탭을 활성화
UniTask.Delay(500).ContinueWith(() => {
//UniTask.Delay(500).ContinueWith(() => {
Debug.Log($"ActivateTab: {parts[0]}");
string tabKey = parts;
tabController.ActivateTab(tabKey, content.Message);
});
//});
}
}
}

78
Assets/Scripts/Studio/Modal/Settings/SettingShortcutTabContent.cs
View File

@@ -12,6 +12,8 @@ namespace UVC.Studio.Modal.Settings
{
public class SettingShortcutTabContent : MonoBehaviour, ITabContent
{
[SerializeField]
private ScrollRect? scrollRect;
[SerializeField]
private LayoutGroup? labelGroup;
@@ -40,10 +42,10 @@ namespace UVC.Studio.Modal.Settings
/// <param name="data">전달할 데이터 객체</param>
public async void SetContentData(object? data)
{
Debug.Log($"SettingShortcutTabContent SetContentData: {data}");
if (setting == null)
{
// Start 전에 호출 되서 Injection 완료 대기 후 Setting 인스턴스 획득
await InjectorAppContext.Instance.WaitForInitializationAsync();
setting = InjectorAppContext.Instance.Get<Setting>();
}
@@ -71,7 +73,7 @@ namespace UVC.Studio.Modal.Settings
{
var shortcut = (ShortcutItem?)field.GetValue(group);
if (shortcut == null) continue;
if (i == 0)
if (i == 0 && group == shortcuts.menu)
{
firstLabelTxt!.text = shortcut.label;
firstValueTxt!.text = shortcut.key;
@@ -128,6 +130,78 @@ namespace UVC.Studio.Modal.Settings
}
}
private void Update()
{
// Tab 키 입력 처리
if (Input.GetKeyDown(KeyCode.Tab) && valueTxts.Count > 0)
{
int currentIndex = GetCurrentFocusedIndex();
if (currentIndex >= 0)
{
int nextIndex = Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift)
? (currentIndex - 1 + valueTxts.Count) % valueTxts.Count // Shift+Tab: 이전
: (currentIndex + 1) % valueTxts.Count; // Tab: 다음
valueTxts[nextIndex].Select();
ScrollToItem(nextIndex);
}
}
}
private int GetCurrentFocusedIndex()
{
for (int i = 0; i < valueTxts.Count; i++)
{
if (valueTxts[i] != null && valueTxts[i].isFocused)
{
return i;
}
}
return -1;
}
/// <summary>
/// 해당 인덱스의 항목이 보이도록 스크롤합니다.
/// </summary>
private void ScrollToItem(int index)
{
if (scrollRect == null || scrollRect.content == null || index < 0 || index >= valueTxts.Count)
return;
RectTransform targetRect = valueTxts[index].GetComponent<RectTransform>();
RectTransform contentRect = scrollRect.content;
RectTransform viewportRect = scrollRect.viewport != null ? scrollRect.viewport : scrollRect.GetComponent<RectTransform>();
// 타겟 항목의 위치 계산
float contentHeight = contentRect.rect.height;
float viewportHeight = viewportRect.rect.height;
if (contentHeight <= viewportHeight) return; // 스크롤 필요 없음
// 타겟의 로컬 위치 (content 기준)
float targetY = -targetRect.anchoredPosition.y;
float itemHeight = targetRect.rect.height;
// 현재 스크롤 위치에서 보이는 영역
float scrollY = contentRect.anchoredPosition.y;
float visibleTop = scrollY;
float visibleBottom = scrollY + viewportHeight;
// 항목이 보이지 않으면 스크롤
if (targetY < visibleTop)
{
// 위로 스크롤
float normalizedPos = targetY / (contentHeight - viewportHeight);
scrollRect.verticalNormalizedPosition = 1f - Mathf.Clamp01(normalizedPos);
}
else if (targetY + itemHeight > visibleBottom)
{
// 아래로 스크롤
float normalizedPos = (targetY + itemHeight - viewportHeight) / (contentHeight - viewportHeight);
scrollRect.verticalNormalizedPosition = 1f - Mathf.Clamp01(normalizedPos);
}
}
/// <summary>
/// 탭 전환 시 데이터가 있는 경우 전달 되는 데이터. SetContentData 이후 호출 됨
/// </summary>

1
Assets/Scripts/Studio/StudioSceneMain.cs
View File

@@ -57,6 +57,7 @@ namespace UVC.Studio
var sceneCtx = FindAnyObjectByType<StudioSceneContext>();
if (sceneCtx != null)
{
// Injection이 완료될 때까지 대기
await sceneCtx.WaitForInitializationAsync();
Initialize();
}