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

간섭 객체 목록 기능 복구

Browse Source
This commit is contained in:
geondo55
2025-04-09 16:11:58 +09:00
parent 807ec619e4
commit 16fe55edc6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs
View File

@@ -73,7 +73,7 @@ namespace XED.Util
Show(); Show();
} }
OnOverlabBegin?.Invoke(GetComponent<TwinObject>(), other.GetComponent<TwinObject>()); OnOverlabBegin?.Invoke(GetComponent<TwinObject>(), other.gameObject.GetComponent<TwinObject>());
} }
private void OnTriggerExit(Collider other) private void OnTriggerExit(Collider other)
{ {
@@ -91,7 +91,7 @@ namespace XED.Util
} }
} }
OnOverlabEnd?.Invoke(GetComponent<TwinObject>(), other.GetComponent<TwinObject>()); OnOverlabEnd?.Invoke(GetComponent<TwinObject>(), other.gameObject.GetComponent<TwinObject>());
} }
public void OnPointerEnter(PointerEventData eventData) public void OnPointerEnter(PointerEventData eventData)
{ {

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

@@ -50,6 +50,7 @@ namespace XED.Manage
var customAssetConnector = ManagerHub.instance.Get<CustomAssetConnector>(); var customAssetConnector = ManagerHub.instance.Get<CustomAssetConnector>();
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>(); var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
var projectManager = ManagerHub.instance.Get<ProjectManager>(); var projectManager = ManagerHub.instance.Get<ProjectManager>();
var interferedObjectManager = ManagerHub.instance.Get<InterferedObjectManager>();
FBXFileManager fbxFileManager = ManagerHub.instance.Get<FBXFileManager>(); FBXFileManager fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
GameObject componentWindow = canvas_Popup.panel_hierarchy.gameObject; GameObject componentWindow = canvas_Popup.panel_hierarchy.gameObject;
@@ -71,6 +72,9 @@ namespace XED.Manage
rayCaster.onUIHoverEvent += canvas_Popup.panel_tooltip.ActivateTooltip; rayCaster.onUIHoverEvent += canvas_Popup.panel_tooltip.ActivateTooltip;
rayCaster.onUIHoverExitEvent += canvas_Popup.panel_tooltip.DeactivateTooltip; rayCaster.onUIHoverExitEvent += canvas_Popup.panel_tooltip.DeactivateTooltip;
//rayCaster.AddEvent(Raycaster.EventType.FirstRightClickOnly, typeof(TwinObject), canvas_Popup.panel_propertyviewer.Activate); //rayCaster.AddEvent(Raycaster.EventType.FirstRightClickOnly, typeof(TwinObject), canvas_Popup.panel_propertyviewer.Activate);
interferedObjectManager.OnAddInterferedPair += canvas_Popup.panel_interferedobjectlist.CreateContentButton;
interferedObjectManager.OnRemoveInterferedPair += canvas_Popup.panel_interferedobjectlist.RemoveContentButton;
} }
InputHandler defaultInputHandler; InputHandler defaultInputHandler;