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

EventConnector->CanvasManager

Browse Source
This commit is contained in:
wsh
2025-05-27 09:37:32 +09:00
parent 6d68500cdd
commit 52e7ec398f
22 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,10 +38,10 @@ namespace Studio.AssetTool
//interferedObjectManager = ManagerHub.instance.Get<InterferedObjectManager>();
renderObjectPrefab = Resources.Load<GameObject>("Prefabs/PRF_RenderObject");
sceneDataContainer = GameObject.FindAnyObjectByType<SceneDataContainer>();
assetScrollRect = EventConnector.instance.GetCanvas<Canvas_Popup>().panel_assetlibrary.scrollRect;
assetScrollView = EventConnector.instance.GetCanvas<Canvas_Popup>().panel_assetlibrary.scrollView;
componentScrollView = EventConnector.instance.GetCanvas<Canvas_Popup>().panel_hierarchy.scrollView;
panel_ObjectDistance = EventConnector.instance.GetCanvas<Canvas_Popup>().panel_objectdistance;
assetScrollRect = CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_assetlibrary.scrollRect;
assetScrollView = CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_assetlibrary.scrollView;
componentScrollView = CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_hierarchy.scrollView;
panel_ObjectDistance = CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_objectdistance;
//InterworkingDataScrollView = EventConnector.instance.GetCanvas<Canvas_Popup>().panel_interworkingdatalist.scrollView;
assetScrollRect.onDragBegin.AddListener(OnAssetSelected);
@@ -231,7 +231,7 @@ namespace Studio.AssetTool
public void OnDeselectAll()
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas_Popup.panel_dynamicobjectinfo.gameObject.SetActive(false);
componentScrollView.DeselectAll();
canvas_Popup.panel_objectdistance.SetSelecetedObjectToNull();
@@ -264,7 +264,7 @@ namespace Studio.AssetTool
}
internal void OnSelectObjects(string name, List<GameObject> selectedObjects)
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas_Popup.panel_dynamicobjectinfo.SetObjectInfo(name, selectedObjects);
canvas_Popup.panel_dynamicobjectinfo.SetActive(true);
canvas_Popup.panel_objectdistance.SelectObjectFromClick(name, selectedObjects);

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

@@ -58,7 +58,7 @@ namespace Studio.AssetTool
{
return;
}
EventConnector.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.OnBeginDrag(clickBeginPos);
CanvasManager.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.OnBeginDrag(clickBeginPos);
}
private void OnMousePointerUp()
{
@@ -78,14 +78,14 @@ namespace Studio.AssetTool
EventSystem.current.RaycastAll(pointerData, raycastResults);
if (raycastResults.Any(x => x.gameObject.layer == uiLayer))
{
EventConnector.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
CanvasManager.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
return;
}
//포인터 업 위치가 포인터 다운 위치에서 크게 벗어났을 경우는 클릭을 무시한다.
if ((clickBeginPos - Input.mousePosition).magnitude > clickLengthThreshold)
{
DeselectAll();
EventConnector.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.OnEndDrag(Input.mousePosition);
CanvasManager.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.OnEndDrag(Input.mousePosition);
return;
}
List<CustomAssetRenderObject> raycastedTarget = new List<CustomAssetRenderObject>();
@@ -142,7 +142,7 @@ namespace Studio.AssetTool
DeselectAll();
}
EventConnector.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
CanvasManager.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
}
public void DeselectAll()
{
@@ -152,7 +152,7 @@ namespace Studio.AssetTool
}
RemoveAllSelections();
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas_Popup.panel_dynamicobjectinfo.ResetObjectInfo();
ManagerHub.instance.Get<CustomAssetConnector>().OnDeselectAll();
@@ -232,8 +232,8 @@ namespace Studio.AssetTool
public void OnTransformChangedFromRTG(List<GameObject> transformObjects)
{
OnTransformChanged(transformObjects);
EventConnector.instance.GetCanvas<Canvas_Popup>().panel_dynamicobjectinfo.OnTransformChanged(transformObjects);
EventConnector.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_dynamicobjectinfo.OnTransformChanged(transformObjects);
CanvasManager.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
}
public void OnTransformChanged(List<GameObject> transformObjects)
{
@@ -304,7 +304,7 @@ namespace Studio.AssetTool
renderObject.onTransformChanged?.Invoke();
}
EventConnector.instance.GetCanvas<Canvas_Popup>().panel_dynamicobjectinfo.OnTransformChanged(objectsToAlign.Select(renderObject => renderObject.gameObject).ToList());
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_dynamicobjectinfo.OnTransformChanged(objectsToAlign.Select(renderObject => renderObject.gameObject).ToList());
}
private void UndoAlign(List<CustomAssetRenderObject> objectsToAlign, List<Vector3> originalPos)
@@ -315,7 +315,7 @@ namespace Studio.AssetTool
renderObject.transform.position = originalPos[i];
renderObject.onTransformChanged?.Invoke();
}
EventConnector.instance.GetCanvas<Canvas_Popup>().panel_dynamicobjectinfo.OnTransformChanged(objectsToAlign.Select(renderObject => renderObject.gameObject).ToList());
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_dynamicobjectinfo.OnTransformChanged(objectsToAlign.Select(renderObject => renderObject.gameObject).ToList());
}
public void VertexSnap()
{

2
Assets/Scripts/Studio/Command/AssetManagerCommand/LoadLocalAssetCommand.cs
View File

@@ -15,7 +15,7 @@ namespace Studio
public void Execute()
{
var assetManager = ManagerHub.instance.Get<AssetManager>();
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
assetManager.CombineAssetFolderPaths(canvas_Popup.panel_assetmanager.GetAssetManagerData().localAssetsPaths);
assetManager.CombineAssetFolderPaths(canvas_Popup.panel_assetsetting.GetAssetManagerData().localAssetsPaths);
assetManager.LoadLocalFBXDirectorys();

2
Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs
View File

@@ -137,7 +137,7 @@ namespace Studio.Command
}
}
ManagerHub.instance.Get<RenderObjectHandler>().DeselectAll();
var canvas = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas.panel_dynamicobjectinfo.ResetObjectInfo();
//connector.onRemoveObjects?.Invoke();
connector.componentScrollView.DeselectAll();

4
Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs
View File

@@ -59,10 +59,10 @@ namespace Studio
}
//connector.onRemoveObjects?.Invoke();
ManagerHub.instance.Get<RenderObjectHandler>().DeselectAll();
var canvas = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas.panel_dynamicobjectinfo.ResetObjectInfo();
connector.componentScrollView.DeselectAll();
EventConnector.instance.GetCanvas<Canvas_Popup>().panel_dynamicobjectinfo.ResetObjectInfo();
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_dynamicobjectinfo.ResetObjectInfo();
}
}
}

2
Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs
View File

@@ -59,7 +59,7 @@ namespace Studio.Command
//connector.onRemoveObjects?.Invoke();
renderObjectHandler.DeselectAll();
connector.componentScrollView.DeselectAll();
var canvas = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas.panel_dynamicobjectinfo.ResetObjectInfo();
}

2
Assets/Scripts/Studio/Command/ProjectCommand/NewProjectCommand.cs
View File

@@ -14,7 +14,7 @@ namespace Studio.Command
public void Execute()
{
var projectManager = ManagerHub.instance.Get<ProjectManager>();
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var projectName = canvas_Popup.panel_newprojectinfo.GetProjectName();
var projectPath = canvas_Popup.panel_newprojectinfo.GetProjectRoute();

2
Assets/Scripts/Studio/Command/ProjectCommand/OpenProjectCommand.cs
View File

@@ -14,7 +14,7 @@ namespace Studio.Command
public void Execute()
{
var projectManager = ManagerHub.instance.Get<ProjectManager>();
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
projectManager.OpenProejctSettingData(canvas_Popup.panel_openprojectinfo.GetProjectRoute());
}

2
Assets/Scripts/Studio/Command/ProjectCommand/TopMenuNewProjectCommand.cs
View File

@@ -16,7 +16,7 @@ namespace Studio
public void Execute()
{
var projectManager = ManagerHub.instance.Get<ProjectManager>();
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var projectName = canvas_Popup.panel_topmenunewprojectinfo.GetProjectName();
var projectPath = canvas_Popup.panel_topmenunewprojectinfo.GetProjectRoute();

2
Assets/Scripts/Studio/Command/ProjectCommand/TopMenuOpenProjectCommand.cs
View File

@@ -16,7 +16,7 @@ namespace Studio
public void Execute()
{
var projectManager = ManagerHub.instance.Get<ProjectManager>();
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var projectPath = canvas_Popup.panel_topmenuopenprojectinfo.GetProjectRoute();
projectManager.OpenProejctSettingData(projectPath);

6
Assets/Scripts/Studio/Connect/ConfigConnected.cs
View File

@@ -11,7 +11,7 @@ namespace Studio.Conifg
{
get
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var result = canvas_Popup.panel_apisetting.GetAPISetting();
return result;
}
@@ -20,7 +20,7 @@ namespace Studio.Conifg
{
get
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var result = canvas_Popup.panel_mqttsetting.GetMQTTSetting();
return result;
}
@@ -30,7 +30,7 @@ namespace Studio.Conifg
{
get
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var result = canvas_Popup.panel_3dfactorysetting.GetAssetDatas();
return result;
}

2
Assets/Scripts/Studio/Core/SystemMain.cs
View File

@@ -15,7 +15,7 @@ namespace Studio.Core
private void Awake()
{
ManagerHub.instance.Init();
EventConnector.instance.Init();
CanvasManager.instance.Init();
}
}
}

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

@@ -22,7 +22,7 @@ namespace Studio
{
folderPathList.Clear();
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
var sceneSettingService = ManagerHub.instance.Get<SceneStartSettingService>();
@@ -60,7 +60,7 @@ namespace Studio
var projectManager = ManagerHub.instance.Get<ProjectManager>();
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas_Popup.panel_3dfactorysetting.SetModelDropdownData(fbxFileManager.dataRepo);
if (projectManager.curProjectData == null)

2
Assets/Scripts/Studio/Managers/EventConnector.cs → Assets/Scripts/Studio/Managers/CanvasManager.cs
View File

@@ -8,7 +8,7 @@ using XRLib.UI;
namespace Studio.Manage
{
[DefaultExecutionOrder(int.MaxValue)]
public class EventConnector : UnitySingleton<EventConnector>
public class CanvasManager : UnitySingleton<CanvasManager>
{
HashSet<CanvasBase> canvases = new();

2
Assets/Scripts/Studio/Managers/CanvasManager.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 68fe65091b9346d4d803044314a62d23

2
Assets/Scripts/Studio/Managers/EventConnector.cs.meta
View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: ae9282330b08c734c89ee9e864323233

2
Assets/Scripts/Studio/Managers/InterferedObjectManager.cs
View File

@@ -18,7 +18,7 @@ namespace Studio.Manage
public override void Init()
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
OnAddInterferedPair += canvas_Popup.panel_interferedobjectlist.CreateContentButton;
OnRemoveInterferedPair += canvas_Popup.panel_interferedobjectlist.RemoveContentButton;
}

2
Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs
View File

@@ -7,7 +7,7 @@ namespace Studio.Manage
{
public PopupCanvasHandler(Canvas_Popup canvas_popup)
{
var canvas_static = EventConnector.instance.GetCanvas<Canvas_Static>();
var canvas_static = CanvasManager.instance.GetCanvas<Canvas_Static>();
//canvas_popup.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_popup.panel_assetproperties.Open);
canvas_popup.panel_assetproperties.onClickPreview += canvas_popup.panel_predefinedtype.Open;
canvas_popup.panel_thumbnail.onGetPosition += canvas_popup.panel_assetlibrary.GetPositionX;

6
Assets/Scripts/Studio/Managers/ProjectManager.cs
View File

@@ -54,7 +54,7 @@ namespace Studio.Manage
}
public void OpenProejctSettingData(string filePath)
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var assetManager = ManagerHub.instance.Get<AssetManager>();
var sceneSettingService = ManagerHub.instance.Get<SceneStartSettingService>();
@@ -82,7 +82,7 @@ namespace Studio.Manage
}
public void OpenProjectSettingsDataAfterDataLoad()
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var sceneSettingService = ManagerHub.instance.Get<SceneStartSettingService>();
if (curProjectData != null)
@@ -145,7 +145,7 @@ namespace Studio.Manage
}
private AssetManagerData CreateAssetManagerData()
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var assetManagerData = canvas_Popup.panel_assetmanager.GetAssetManagerData();
return assetManagerData;

12
Assets/Scripts/Studio/Managers/SceneStartSettingService.cs
View File

@@ -17,7 +17,7 @@ namespace Studio
public override void Init()
{
sceneStartSetting = new SceneStartSetting();
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas_Popup.panel_appsetting.onClose += GetAppSettingData;
canvas_Popup.panel_apisetting.onClose += GetAPISettingData;
canvas_Popup.panel_mqttsetting.onClose += GetMQTTSettingData;
@@ -34,24 +34,24 @@ namespace Studio
}
public void GetAppSettingData()
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
sceneStartSetting.appSetting = canvas_Popup.panel_appsetting.GetAppSetting();
}
public void GetAPISettingData()
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
sceneStartSetting.apiSetting = canvas_Popup.panel_apisetting.GetAPISetting();
}
public void GetMQTTSettingData()
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
sceneStartSetting.mqttSetting = canvas_Popup.panel_mqttsetting.GetMQTTSetting();
canvas_Popup.panel_3dfactorysetting.SetDataDropdownData(sceneStartSetting.mqttSetting);
}
public void Get3DFactorySettingData()
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
sceneStartSetting.factorySetting = canvas_Popup.panel_3dfactorysetting.GetDynamic3DModelSetting();
}
public void SetSceneStartSetting(SceneStartSetting sceneStartSetting)
@@ -71,7 +71,7 @@ namespace Studio
}
public void SetMQTTSettingData(MQTTSetting mqttSetting)
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
onMQTTSetting?.Invoke(mqttSetting);
canvas_Popup.panel_3dfactorysetting.SetDataDropdownData(mqttSetting);

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

@@ -9,7 +9,7 @@ namespace Studio.Manage
{
public StaticCanvasHandler(Canvas_Static canvas_static)
{
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas_static.panel_scenetab.onSceneSettingTab += canvas_Popup.panel_startsetting.Active;
GameObject hierarchyWindow = canvas_Popup.panel_hierarchy.gameObject;

2
Assets/Scripts/Studio/UI/Elements/UI_MQTTConnection.cs
View File

@@ -37,7 +37,7 @@ namespace Studio
Button_TestMQTT.onClick.AddListener(OnClickMQTTTest);
Button_Remove.onClick.AddListener(OnClickRemoveItemButton);
panel_MQTTTestResult = EventConnector.instance.GetCanvas<Canvas_Popup>().panel_mqtttestresult;
panel_MQTTTestResult = CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_mqtttestresult;
inputTopicItems.Clear();
}
private void OnClickAddURLItemButton()