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

Canvas_Component 삭제

Browse Source
This commit is contained in:
wsh
2025-05-23 13:52:09 +09:00
parent b7aeec020b
commit fce0546697
9 changed files with 13 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1117
Assets/Prefabs/UI/Canvas/Canvas_ComponentViewer.prefab
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/UI/Canvas/Canvas_ComponentViewer.prefab.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: b31ed6f26ae835642aff7c05b72322c8
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

19
Assets/Scripts/Studio/AssetTool/FBXFileManager.cs
View File

@@ -196,6 +196,7 @@ namespace Studio.AssetTool
Texture2D thumbnail = new Texture2D(1, 1);
thumbnail.LoadImage(saveData.thumbnailDatas[index].data);
GameObject newObject = new GameObject(assetName);
newObject.transform.parent = fbxAnchor;
CustomAssetData assetData = newObject.AddComponent<CustomAssetData>();
@@ -208,18 +209,24 @@ namespace Studio.AssetTool
assetData.Manager = manager;
assetData.loadedObject = modelData.LoadModelData(sharedMaterial);
assetData.thumbnail = thumbnail;
assetData.OnLoadComplete();
OnLoadComplete(assetData);
//assetData.onLoadProgress.RemoveAllListeners();
//assetData.onLoadProgress.AddListener((x) => item.onLoadProgress?.Invoke(x));
}
void OnLoadComplete(CustomAssetData assetData)
{
assetData.OnLoadComplete();
string folderName = assetData.folderName;
dataRepo.Add(assetData);
//listAssets.Add(assetData);
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
AssetLibraryItem parent = connector.assetScrollView.FindItem(folderName, AssetLibraryItemType.folder) ??
AssetLibraryItem urlSectionItem = connector.assetScrollView.FindItem(folderName, AssetLibraryItemType.folder) ??
connector.assetScrollView.AddItem(folderName, null, AssetLibraryItemType.folder);
AssetLibraryItem item = connector.assetScrollView.AddItem(assetData.assetName, assetData.gameObject, AssetLibraryItemType.file, parent);
assetData.onLoadProgress.RemoveAllListeners();
assetData.onLoadProgress.AddListener((x) => item.onLoadProgress?.Invoke(x));
AssetLibraryItem item = connector.assetScrollView.AddItem(assetData.assetName, assetData.gameObject, AssetLibraryItemType.file, urlSectionItem);
}
}
}

2
Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs
View File

@@ -14,13 +14,11 @@ namespace Studio
public Panel_DragHandler panel_draghandler;
public override void AfterAwake()
{
GetComponent<Canvas>().sortingOrder = 1;
panel_draghandler.onDragBoxSelect += OnDragBoxSelect;
}
public void OnDragBoxSelect(Rect selectionBoxRect)
{
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
List<ConnectedAsset> activeAssets = connector.connectedAssets.FindAll(x => x.renderObject != null && x.renderObject.gameObject.activeSelf);
if (activeAssets.Count == 0)

14
Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs
View File

@@ -93,20 +93,6 @@ namespace Studio
panel_exitchecker.onExit += quitManager.OnConfirmQuit;
panel_exitchecker.onCancel += quitManager.OnCancelQuit;
//panel_dataconnectmodal.onSaveConnectedData += dataManager.SaveData;
//panel_alarmconnectmodal.onSaveConnectAlarmData += dataManager.SaveAlarmData;
//panel_dynamicobjectinfo.onRetouchData += dataManager.LoadData;
//panel_dynamicobjectinfo.onDeleteData += dataManager.RemoveData;
//panel_dynamicobjectinfo.onRetouchAlarm += dataManager.LoadAlarmData;
//panel_dynamicobjectinfo.onDeleteAlarm += dataManager.RemoveAlarmData;
//dataManager.onConnectData += panel_dynamicobjectinfo.OnConnectData;
//dataManager.onLoadData += panel_dataconnectmodal.SetLoadSaveData;
//dataManager.onConnectAlarm += panel_dynamicobjectinfo.OnConnectAlarm;
//dataManager.onLoadAlarm += panel_alarmconnectmodal.LoadData;
}
void SetPanelAsLastSibling(UIBase panel)

58
Assets/Scripts/Studio/Utility/Canvas_Component.cs
View File

@@ -1,58 +0,0 @@
using NUnit.Framework;
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.UI.Extensions;
using Studio.Manage;
using XRLib.UI;
namespace Studio.UI
{
public class Canvas_Component : CanvasBase
{
public UILineRenderer prf_LineRenderer;
public UILineGroupRenderer groupliner;
public void Connect(ConnectionHandlePoint p1, ConnectionHandlePoint p2)
{
groupliner = FindFirstObjectByType<UILineGroupRenderer>();
groupliner.AddPoints(p1.transform, p2.transform);
//var line = Instantiate(prf_LineRenderer, transform);
//var p1Pos = new Vector2(p1.transform.position.x + rectTransform.rect.position.x , p1.transform.position.y + rectTransform.rect.position.y);
//var p2Pos = new Vector2(p2.transform.position.x + rectTransform.rect.position.x , p2.transform.position.y + rectTransform.rect.position.y);
//line.Points = new Vector2[] { p1Pos, p2Pos };
//line.SetAllDirty();
//line.transform.SetAsFirstSibling();
}
List<(ConnectionHandlePoint, ConnectionHandlePoint)> connections = new();
List<ConnectionHandlePoint> connection = new();
internal void Connect(ConnectionHandlePoint connectionHandlePoint)
{
connection.Add(connectionHandlePoint);
connectionHandlePoint.GetComponent<Image>().color = Color.white;
if (connection.Count == 2)
{
connection[0].GetComponent<Image>().color = Color.black;
connection[1].GetComponent<Image>().color = Color.black;
if (connections.Contains((connection[0], connection[1])))
{
connections.Remove((connection[0], connection[1]));
connections.Remove((connection[1], connection[0]));
groupliner.Remove(connection[0].transform, connection[1].transform);
connection.Clear();
return;
}
connections.Add((connection[0], connection[1]));
connections.Add((connection[1], connection[0]));
Connect(connection[0], connection[1]);
connection.Clear();
}
}
}
}

2
Assets/Scripts/Studio/Utility/Canvas_Component.cs.meta
View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 90d2b3fed62b6c146b12eb0eff2c960d

20
Assets/Scripts/Studio/Utility/ConnectionHandlePoint.cs
View File

@@ -1,20 +0,0 @@
using System.Linq;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using UnityEngine.UI.Extensions;
using XRLib.UI;
using Studio.UI;
using static DrawLine;
namespace Studio
{
public class ConnectionHandlePoint : UIBase, IPointerDownHandler
{
public void OnPointerDown(PointerEventData eventData)
{
//clickPos = new Vector2(eventData.position.x + rectTransform.rect.x, eventData.position.y + rectTransform.rect.y);
FindFirstObjectByType<Canvas_Component>().Connect(this);
}
}
}

2
Assets/Scripts/Studio/Utility/ConnectionHandlePoint.cs.meta
View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 032c2cbed657bf249b8657fd8432a697