Merge pull request '새 프로젝트를 불러오거나 기존 프로젝트를 열 때마다 에셋을 다시 불러오는 문제' (#158) from pgd/20250612_2merge into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/158
This commit was merged in pull request #158.
This commit is contained in:
@@ -254,7 +254,15 @@ namespace Studio.AssetTool
|
||||
componentScrollView.DeselectAll();
|
||||
//canvas_Popup.panel_objectdistance.SetSelecetedObjectToNull();
|
||||
}
|
||||
|
||||
public void DestoryConnectedAssetAll()
|
||||
{
|
||||
foreach (ConnectedAsset connectedAsset in connectedAssets)
|
||||
{
|
||||
connectedAsset.renderObject.Deselect();
|
||||
GameObject.Destroy(connectedAsset.renderObject.gameObject);
|
||||
}
|
||||
connectedAssets.Clear();
|
||||
}
|
||||
public void OrderByHierarchy(List<CustomAssetRenderObject> objectsToOrder)
|
||||
{
|
||||
SortedDictionary<int, CustomAssetRenderObject> itemToObject = new SortedDictionary<int, CustomAssetRenderObject>();
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Studio.Util;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Studio.Repositories
|
||||
{
|
||||
@@ -34,6 +35,16 @@ namespace Studio.Repositories
|
||||
{
|
||||
assetDatas.Remove(assetData);
|
||||
}
|
||||
|
||||
public void RemoveAll()
|
||||
{
|
||||
foreach (var assetData in assetDatas)
|
||||
{
|
||||
GameObject.Destroy(assetData.gameObject);
|
||||
}
|
||||
|
||||
assetDatas.Clear();
|
||||
}
|
||||
|
||||
internal bool TryGetDataFromName(string name, out CustomAssetData p)
|
||||
{
|
||||
|
||||
@@ -58,11 +58,12 @@ namespace Studio
|
||||
}
|
||||
}
|
||||
//connector.onRemoveObjects?.Invoke();
|
||||
ManagerHub.instance.Get<RenderObjectHandler>().DeselectAll();
|
||||
var canvas = CanvasManager.instance.GetCanvas<Canvas_Popup>();
|
||||
canvas.panel_dynamicobjectinfo.ResetObjectInfo();
|
||||
connector.componentScrollView.DeselectAll();
|
||||
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_dynamicobjectinfo.ResetObjectInfo();
|
||||
ManagerHub.instance.Get<RenderObjectHandler>().DeselectAll();
|
||||
connector.DestoryConnectedAssetAll();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ namespace Studio.AssetTool
|
||||
}
|
||||
public void ClearFilePaths()
|
||||
{
|
||||
dataRepo.assetDatas.Clear();
|
||||
dataRepo.RemoveAll();
|
||||
filePaths.Clear();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user