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

Run, Stop 분기 처리

Browse Source
This commit is contained in:
geondo55
2025-05-27 19:44:13 +09:00
parent a627cbb298
commit aa99e41b2e
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,6 @@ namespace Studio.AssetTool
public GameObject CreateAsset(string name) public GameObject CreateAsset(string name)
{ {
AssetLibraryItem item = assetScrollView.FindItem(name, AssetLibraryItemType.file); AssetLibraryItem item = assetScrollView.FindItem(name, AssetLibraryItemType.file);
OnAssetSelected(item); OnAssetSelected(item);
GameObject obj = selectRenderObject.gameObject; GameObject obj = selectRenderObject.gameObject;
OnAssetDropped(item); OnAssetDropped(item);
@@ -281,7 +280,7 @@ namespace Studio.AssetTool
} }
internal void OnSelectObjects(string name, List<GameObject> selectedObjects) internal void OnSelectObjects(string name, List<GameObject> selectedObjects)
{ {
if (selectedObjects.Count == 0) if (selectedObjects.Count == 0)
return; return;
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>(); var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
if (ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run) if (ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)

3
Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs
View File

@@ -141,7 +141,6 @@ namespace Studio.AssetTool
CommandInvoker.instance.Invoke(new ResetGizmoCommand()); CommandInvoker.instance.Invoke(new ResetGizmoCommand());
DeselectAll(); DeselectAll();
} }
CanvasManager.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag(); CanvasManager.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
} }
public void DeselectAll() public void DeselectAll()
@@ -429,7 +428,7 @@ namespace Studio.AssetTool
#else #else
shortcutTable.Add(KeyCode.LeftControl, new Dictionary<KeyCode, Action>()); shortcutTable.Add(KeyCode.LeftControl, new Dictionary<KeyCode, Action>());
shortcutTable[KeyCode.LeftControl].Add(KeyCode.C, SaveItemsToCopy); shortcutTable[KeyCode.LeftControl].Add(KeyCode.C, SaveItemsToCopy);
shortcutTable[KeyCode.LeftShift].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand())); shortcutTable[KeyCode.LeftControl].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand()));
#endif #endif
var handler = new InputHandler(getKeyActions, downKeyActions, upKeyActions, shortcutTable); var handler = new InputHandler(getKeyActions, downKeyActions, upKeyActions, shortcutTable);

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

@@ -1,4 +1,5 @@
using NUnit.Framework; using NUnit.Framework;
using Studio.AssetTool;
using Studio.Conifg; using Studio.Conifg;
using Studio.Manage; using Studio.Manage;
using Studio.Util; using Studio.Util;
@@ -26,7 +27,10 @@ namespace Studio.Manage
{ {
StudioService.instance.Init(); StudioService.instance.Init();
onRun += Dynamic.M.AGVManager.instance.OnPlayStart; onRun += Dynamic.M.AGVManager.instance.OnPlayStart;
onRun += ManagerHub.instance.Get<RenderObjectHandler>().rtgController.InitGizmo;
onRun += ManagerHub.instance.Get<CustomAssetConnector>().OnDeselectAll;
onStop += StudioService.instance.DisConnectMQTT; onStop += StudioService.instance.DisConnectMQTT;
onStop += ManagerHub.instance.Get<CustomAssetConnector>().OnDeselectAll;
} }
public void ChangeState() public void ChangeState()

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

@@ -6,6 +6,7 @@ using Studio.Util;
using XRLib; using XRLib;
using XRLib.UI; using XRLib.UI;
using Studio.AssetTool; using Studio.AssetTool;
using Studio.Manage;
namespace Studio.UI namespace Studio.UI
{ {
@@ -44,7 +45,7 @@ namespace Studio.UI
private void Update() private void Update()
{ {
if (selectedObject == null || selectedObject.isCollided) if (selectedObject == null || selectedObject.isCollided || ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)
{ {
DeactivateAll(); DeactivateAll();
return; return;