UVCXR/OCTOPUS_TWIN-Demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
wsh
2026-02-09 18:39:38 +09:00
parent 998cdd7236
commit 035a9137e6
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/DownloadAssets/XRLib/Scripts/UVC/Data/Core/DataMask.cs
View File

@@ -9,6 +9,7 @@ using System.Linq;
using System.Text;
using UnityEngine;
using UVC.Extension;
using UVC.Extention;
namespace UVC.Data.Core
{

1
Assets/DownloadAssets/XRLib/Scripts/UVC/Data/Core/DataObject.cs
View File

@@ -8,6 +8,7 @@ using System.Linq;
using System.Threading;
using Cysharp.Threading.Tasks;
using UVC.Extension;
using UVC.Extention;
namespace UVC.Data.Core
{

1
Assets/DownloadAssets/XRLib/Scripts/UVC/Data/UserSetting.cs
View File

@@ -8,6 +8,7 @@ using System.Linq;
using UnityEngine;
using UVC.Data.Core;
using UVC.Extension;
using UVC.Extention;
namespace UVC.Data
{

2
Assets/DownloadAssets/XRLib/Scripts/UVC/Log/SQLiteAppender.cs
View File

@@ -4,7 +4,7 @@ using log4net.Appender;
using log4net.Core;
using SQLite4Unity3d;
using System.Threading;
using UVC.Extension;
using UVC.Extention;
namespace UVC.Log
{

33
Assets/Scripts/OctopusTwin/ShortcutConfigurator.cs
View File

@@ -6,6 +6,7 @@ using UVC.Studio.Command;
using UVC.Studio.Config;
using UVC.Studio.Manager;
using UVC.Util;
using UVC.Extention;
public class ShortcutConfigurator : MonoBehaviour
{
@@ -18,11 +19,11 @@ public class ShortcutConfigurator : MonoBehaviour
[Inject]
private SelectionManager? selectionManager;
// 단축키 관리자
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ű <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
public ShortcutManager? shortcutManager;
/// <summary>
/// 단축키 관리자를 설정합니다.
/// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ű <20><><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>մϴ<D5B4>.
/// </summary>
public async void SetupShortcutManager()
{
@@ -31,7 +32,7 @@ public class ShortcutConfigurator : MonoBehaviour
selectionManager = InjectorAppContext.Instance.Get<SelectionManager>();
stageObjectManager = InjectorAppContext.Instance.Get<StageObjectManager>();
// StudioShortcutManager 생성 또는 가져오기
// StudioShortcutManager <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>Ǵ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
shortcutManager = ShortcutManager.Instance;
if (shortcutManager == null)
{
@@ -40,7 +41,7 @@ public class ShortcutConfigurator : MonoBehaviour
DontDestroyOnLoad(go);
}
// Setting 주입
// Setting <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Setting? currentSetting = setting;
if (currentSetting == null && InjectorAppContext.Instance != null)
{
@@ -51,52 +52,52 @@ public class ShortcutConfigurator : MonoBehaviour
shortcutManager.SetSetting(currentSetting);
}
// 메뉴 단축키 등록
// <EFBFBD>޴<EFBFBD> <20><><EFBFBD><EFBFBD>Ű <20><><EFBFBD>
RegisterMenuShortcuts();
// 도구 단축키 등록
RegisterToolShortcuts();
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ű <20><><EFBFBD>
//RegisterToolShortcuts();
Debug.Log("[SetupShortcutManager] 단축키 관리자가 설정되었습니다.");
Debug.Log("[SetupShortcutManager] <EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ű <20><><EFBFBD><EFBFBD><EFBFBD>ڰ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>.");
}
/// <summary>
/// 메뉴 단축키를 등록합니다.
/// <EFBFBD>޴<EFBFBD> <20><><EFBFBD><EFBFBD>Ű<EFBFBD><C5B0> <20><><EFBFBD><EFBFBD>մϴ<D5B4>.
/// </summary>
private void RegisterMenuShortcuts()
{
if (shortcutManager == null) return;
// Edit 메뉴
// Edit <EFBFBD>޴<EFBFBD>
shortcutManager.RegisterMenuShortcut("delete", new EditDeleteCommand(selectionManager!, stageObjectManager!));
}
/// <summary>
/// 도구 단축키를 등록합니다.
/// <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ű<EFBFBD><C5B0> <20><><EFBFBD><EFBFBD>մϴ<D5B4>.
/// </summary>
private void RegisterToolShortcuts()
{
if (shortcutManager == null) return;
// 도구 단축키 - SelectionManager를 통해 기즈모 제어
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ű - SelectionManager<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
shortcutManager.RegisterToolShortcut("select", () =>
{
if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Select);
//if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Select);
});
shortcutManager.RegisterToolShortcut("move", () =>
{
if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Move);
//if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Move);
});
shortcutManager.RegisterToolShortcut("rotate", () =>
{
if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Rotate);
//if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Rotate);
});
shortcutManager.RegisterToolShortcut("scale", () =>
{
if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Scale);
// if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Scale);
});
shortcutManager.RegisterToolShortcut("node", () =>