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

Merge branch 'pgd/20250527_merge2' into pgd/20250528

Browse Source
This commit is contained in:
geondo55
2025-05-28 09:59:52 +09:00
parent 5003ee2a11 9c607e3e75
commit b106724f4a
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Scripts/ExternalAssets/Gizmo/RTGController.cs
View File

@@ -61,7 +61,9 @@ namespace Studio.RuntimeGizmo
workGizmoId = GizmoId.None;
}
public void SetWorkGizmoId(GizmoId gizmoId)
{
{
if (ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)
return;
objectMoveGizmo.Gizmo.SetEnabled(false);
objectRotationGizmo.Gizmo.SetEnabled(false);
objectScaleGizmo.Gizmo.SetEnabled(false);
@@ -102,6 +104,8 @@ namespace Studio.RuntimeGizmo
}
public void SetGizmoTargetObjects(List<GameObject> objects)
{
if (ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)
return;
selectedObjects.Clear();
selectedObjects.AddRange(objects);
objectMoveGizmo.SetTargetObjects(selectedObjects);
@@ -111,6 +115,10 @@ namespace Studio.RuntimeGizmo
workGizmo.Gizmo.SetEnabled(selectedObjects.Count != 0);
}
public void ResetGizmo()
{
SetGizmoTargetObjects(new List<GameObject>());
}
private void OnGizmoDragBegin(Gizmo gizmo, int t)
{
onTransformBegin?.Invoke();

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

@@ -125,7 +125,6 @@ namespace Studio.AssetTool
public GameObject CreateAsset(string name)
{
AssetLibraryItem item = assetScrollView.FindItem(name, AssetLibraryItemType.file);
OnAssetSelected(item);
GameObject obj = selectRenderObject.gameObject;
OnAssetDropped(item);
@@ -283,7 +282,7 @@ namespace Studio.AssetTool
}
internal void OnSelectObjects(string name, List<GameObject> selectedObjects)
{
if (selectedObjects.Count == 0)
if (selectedObjects.Count == 0)
return;
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
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());
DeselectAll();
}
CanvasManager.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
}
public void DeselectAll()
@@ -429,7 +428,7 @@ namespace Studio.AssetTool
#else
shortcutTable.Add(KeyCode.LeftControl, new Dictionary<KeyCode, Action>());
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
var handler = new InputHandler(getKeyActions, downKeyActions, upKeyActions, shortcutTable);

7
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.Manage;
using Studio.Util;
@@ -28,8 +29,10 @@ namespace Studio.Manage
public void ChangeState()
{
ManagerHub.instance.Get<RenderObjectHandler>().rtgController.ResetGizmo();
ManagerHub.instance.Get<CustomAssetConnector>().OnDeselectAll();
curState = curState == EState.Stop ? EState.Run : EState.Stop;
Debug.Log("curState " + curState);
switch (curState)
{
case EState.Run:

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

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