리펙토링 완 #41

Merged
UVCXR merged 7 commits from sjm/250407 into main 2025-04-08 09:24:04 +09:00
3 changed files with 13 additions and 3 deletions
Showing only changes of commit 6e1fb78966 - Show all commits

View File

@@ -19,6 +19,7 @@ namespace XED.Asset
public CustomScrollRect assetScrollRect;
public PooledScrollView componentScrollView;
public PooledScrollView InterworkingDataScrollView;
public Panel_ObjectDistance panel_ObjectDistance;
public GameObject renderObjectPrefab;
public float objectShowDistance = 1000.0f;
@@ -38,7 +39,7 @@ namespace XED.Asset
public CustomAssetDataHandler assetDataHandler;
public CustomAssetEventHandler assetEventHandler;
InterferedObjectManager interferedObjectManager;
public InterferedObjectManager interferedObjectManager;
ProjectManager projectManager;
void Awake()
@@ -56,6 +57,7 @@ namespace XED.Asset
assetScrollView = FindSingle<Canvas_Popup>().panel_assetlibrary.scrollView;
componentScrollView = FindSingle<Canvas_Popup>().panel_hierarchy.scrollView;
InterworkingDataScrollView = FindSingle<Canvas_Popup>().panel_interworkingdatalist.scrollView;
panel_ObjectDistance = FindSingle<Canvas_Popup>().panel_objectdistance;
interferedObjectManager = FindSingle<InterferedObjectManager>();
renderObjectPrefab = Resources.Load<GameObject>("Prefabs/PRF_RenderObject");
@@ -146,6 +148,7 @@ namespace XED.Asset
selectRenderObject = selectedItem.GetComponent<CustomAssetRenderObject>();
selectRenderObject.OnOverlabBegin += interferedObjectManager.AddInterferedPair;
selectRenderObject.OnOverlabEnd += interferedObjectManager.RemoveInterferedPair;
selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate;
selectRenderObject.instantiateObject = selectedAssetData.InstantiateLoadedObject;
selectRenderObject.getBounds = selectedAssetData.GetCombinedBoundary;
selectRenderObject.CreateRenderObject();

View File

@@ -31,6 +31,7 @@ namespace XED.Util
public event Action<TwinObject, TwinObject> OnOverlabBegin;
public event Action<TwinObject, TwinObject> OnOverlabEnd;
public event Action<CustomAssetRenderObject> OnSelected;
private void Awake()
{
@@ -189,7 +190,7 @@ namespace XED.Util
public void Select()
{
//ResizeBoundary();
FindSingle<Panel_ObjectDistance>().SelectObjectFromCreate(this);
OnSelected?.Invoke(this);
isSelected = true;
objectRenderer.material = matCubeSelected;
Show();

View File

@@ -2,6 +2,7 @@ using System.Collections.Generic;
using UnityEngine;
using XED.Asset;
using XED.HierarchyTree;
using XED.UI;
using XED.Util;
namespace XED.Command
@@ -45,8 +46,10 @@ namespace XED.Command
copyAsset.renderObject.transform.position = copySource.renderObject.transform.position;
copyAsset.renderObject.transform.rotation = copySource.renderObject.transform.rotation;
copyAsset.renderObject.transform.localScale = copySource.renderObject.transform.localScale;
copyAsset.renderObject.OnOverlabBegin += connector.interferedObjectManager.AddInterferedPair;
copyAsset.renderObject.OnOverlabEnd += connector.interferedObjectManager.RemoveInterferedPair;
List<Transform> lastParent = new List<Transform>();
List <Transform> lastParent = new List<Transform>();
for (int j = 0; j < copyAsset.hierarchyItem.layerNum + 1; j++)
{
lastParent.Add(copyAsset.renderObject.transform);
@@ -70,6 +73,9 @@ namespace XED.Command
childAsset.renderObject.transform.rotation = childSource.renderObject.transform.rotation;
childAsset.renderObject.transform.localScale = childSource.renderObject.transform.localScale;
childAsset.renderObject.transform.parent = lastParent[childAsset.hierarchyItem.layerNum - 1];
childAsset.renderObject.OnOverlabBegin += connector.interferedObjectManager.AddInterferedPair;
childAsset.renderObject.OnOverlabEnd += connector.interferedObjectManager.RemoveInterferedPair;
if (lastParent.Count <= childAsset.hierarchyItem.layerNum)
{
lastParent.Add(childAsset.renderObject.transform);