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

Merge pull request 'Undo, Redo 시 객체의 콜라이더가 정상적이지 않은 문제' (#188) from pgd/20250627_2 into main

Browse Source 
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/188
This commit was merged in pull request #188.
This commit is contained in:
UVCXR
2025-06-30 15:55:55 +09:00
parent 41b02ffecf 70af2d5a38
commit e7be4f65a7
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,7 @@ namespace Studio.AssetTool
//selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate;
selectRenderObject.instantiateObject = selectedAssetData.InstantiateLoadedObject;
selectRenderObject.getBounds = selectedAssetData.GetCombinedBoundary;
selectRenderObject.CreateRenderObject();
selectRenderObject.CreateRenderObjectAndResizeBoundary();
selectRenderObject.Select();
selectedAssetData.AddTransformToRender(selectedItem.transform);
CoroutineRunner.instance.StartCoroutine(ChangeSelectedAssetTransform());
@@ -183,7 +183,7 @@ namespace Studio.AssetTool
//selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate;
selectRenderObject.instantiateObject = selectedAssetData.InstantiateLoadedObject;
selectRenderObject.getBounds = selectedAssetData.GetCombinedBoundary;
selectRenderObject.CreateRenderObject();
selectRenderObject.CreateRenderObjectAndResizeBoundary();
selectRenderObject.Select();
selectedAssetData.AddTransformToRender(selectedItem.transform);
CoroutineRunner.instance.StartCoroutine(ChangeSelectedAssetTransform());

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

@@ -218,6 +218,13 @@ namespace Studio.AssetTool
Hide();
}
public void CreateRenderObject()
{
if (renderObject == null)
{
renderObject = instantiateObject?.Invoke(transform);
}
}
public void CreateRenderObjectAndResizeBoundary()
{
if (renderObject == null)
{

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

@@ -56,7 +56,7 @@ namespace Studio.Command
copyAsset.renderObject.getBounds = copySource.assetData.GetCombinedBoundary;
copyAsset.renderObject.onTransformChanged = copySource.assetData.OnTransformDataChanged;
copyAsset.renderObject.instantiateObject = copySource.assetData.InstantiateLoadedObject;
copyAsset.renderObject.CreateRenderObject();
copyAsset.renderObject.CreateRenderObjectAndResizeBoundary();
copyAsset.hierarchyItem.linkedObject = copyObject;
copyAsset.renderObject.transform.position = copySource.renderObject.transform.position;
copyAsset.renderObject.transform.rotation = copySource.renderObject.transform.rotation;
@@ -83,7 +83,7 @@ namespace Studio.Command
childAsset.renderObject.getBounds = childAsset.assetData.GetCombinedBoundary;
childAsset.renderObject.onTransformChanged = childAsset.assetData.OnTransformDataChanged;
childAsset.renderObject.instantiateObject = childSource.assetData.InstantiateLoadedObject;
childAsset.renderObject.CreateRenderObject();
childAsset.renderObject.CreateRenderObjectAndResizeBoundary();
childAsset.hierarchyItem.linkedObject = copyChildObject;
childAsset.renderObject.transform.position = childSource.renderObject.transform.position;
childAsset.renderObject.transform.rotation = childSource.renderObject.transform.rotation;