diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetCommandHandler.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetCommandHandler.cs index 2a3c4e8f..48a52477 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetCommandHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetCommandHandler.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; using XED.Asset; -using XED.Hierarchy; +using XED.HierarchyTree; using XED.Manage; using XED.Util; diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index 3394b515..49720778 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -5,7 +5,7 @@ using XRLib; using XED.Manage; using XED.Command; using XED.Util; -using XED.Hierarchy; +using XED.HierarchyTree; using System.Linq; using UnityEditor; diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs index 65e0a602..7a26a352 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs @@ -1,5 +1,5 @@ using XED.Asset; -using XED.Hierarchy; +using XED.HierarchyTree; using XED.Util; namespace XED diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs index f164cb7b..d1e23bee 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using XED.Hierarchy; +using XED.HierarchyTree; using XED.Util; namespace XED.Asset diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs index 71773f63..eb569dca 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; using UnityEngine.EventSystems; +using XED.DataStructures; using XED.UI; namespace XED.Util diff --git a/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs b/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs index e4c9e124..ec73c86b 100644 --- a/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs +++ b/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs @@ -6,10 +6,8 @@ using System.Collections; using TriLibCore.SFB; using XED.Util; using System.Threading.Tasks; -using MessagePack; using System; using System.Linq; -using UnityEngine.Rendering; using XED.Repositories; namespace XED.Manage @@ -102,11 +100,6 @@ namespace XED.Manage yield return new WaitUntil(() => loadFilePath.Count > 0); string path = loadFilePath.Dequeue(); string name = System.IO.Path.GetFileNameWithoutExtension(path); - string directoryPath = Path.GetDirectoryName(path); - string lastFolderName = Path.GetFileName(directoryPath); - string createDate = File.GetCreationTime(path).ToShortDateString(); - string lastRevisionDate = File.GetLastAccessTime(path).ToShortDateString(); - string uploadDate = DateTime.Now.ToShortDateString(); //if (listAssets.Find(x => x.name == name) != null) //{ @@ -120,6 +113,12 @@ namespace XED.Manage continue; } + string directoryPath = Path.GetDirectoryName(path); + string lastFolderName = Path.GetFileName(directoryPath); + string createDate = File.GetCreationTime(path).ToShortDateString(); + string lastRevisionDate = File.GetLastAccessTime(path).ToShortDateString(); + string uploadDate = DateTime.Now.ToShortDateString(); + GameObject newObject = new GameObject(name); newObject.transform.parent = transform; CustomAssetData assetData = newObject.AddComponent(); @@ -175,21 +174,8 @@ namespace XED.Manage for (int i = 0; i < assetDatas.Count; i++) { - CustomAssetData assetData = assetDatas[i]; - SavedModelData modelData = new SavedModelData(); - modelData.SaveData(assetData.loadedObject, sharedMaterial); - //갯수 제한 없음 원하는 만큼 조절 가능. 테스트로 10개만 지정 - modelData.attributes = new string[7][]; - modelData.attributes[0] = new string[] { "assetName", assetData.assetName }; - modelData.attributes[1] = new string[] { "folderName", assetData.folderName }; - - modelData.attributes[2] = new string[] { "createDate", assetData.createDate }; - modelData.attributes[3] = new string[] { "LastRevisionDate", assetData.LastRevisionDate }; - modelData.attributes[4] = new string[] { "UploadDate", assetData.UploadDate }; - modelData.attributes[5] = new string[] { "Creator", assetData.createDate }; - modelData.attributes[6] = new string[] { "Manager", assetData.Manager }; - - Texture2D thumbnail = RuntimePreviewGenerator.GenerateModelPreview(assetData.loadedObject.transform, 320, 200); + var modelData = ConvertToSaveData(assetDatas[i]); + Texture2D thumbnail = RuntimePreviewGenerator.GenerateModelPreview(assetDatas[i].loadedObject.transform, 320, 200); thumbnail = thumbnail.MakeReadableTexture(); thumbnails.Add(new ThumbnailData(thumbnail.EncodeToPNG())); savedModels.Add(modelData); @@ -209,6 +195,23 @@ namespace XED.Manage yield return null; } + SavedModelData ConvertToSaveData(CustomAssetData assetData) + { + SavedModelData modelData = new SavedModelData(); + modelData.SaveData(assetData.loadedObject, sharedMaterial); + //갯수 제한 없음 원하는 만큼 조절 가능. 테스트로 10개만 지정 + modelData.attributes = new string[7][]; + modelData.attributes[0] = new string[] { "assetName", assetData.assetName }; + modelData.attributes[1] = new string[] { "folderName", assetData.folderName }; + + modelData.attributes[2] = new string[] { "createDate", assetData.createDate }; + modelData.attributes[3] = new string[] { "LastRevisionDate", assetData.LastRevisionDate }; + modelData.attributes[4] = new string[] { "UploadDate", assetData.UploadDate }; + modelData.attributes[5] = new string[] { "Creator", assetData.createDate }; + modelData.attributes[6] = new string[] { "Manager", assetData.Manager }; + return modelData; + } + string GetLocalPath(string path) { if (string.IsNullOrEmpty(path)) diff --git a/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs b/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs index 545ee4b9..8b824215 100644 --- a/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs @@ -5,6 +5,7 @@ using UnityEditor; using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; +using XED.DataStructures; using XED.Interfaces; using XED.Manage; using XED.RuntimeGizmo; @@ -14,7 +15,6 @@ namespace XED.Util public class RenderObjectHandler : MonoBehaviour, IModeController, IInputHandler { public ModePanel.ProgramMode mode => ModePanel.ProgramMode.ObjectLayout; - List selectedRenderObjects = new List(); List copyRenderObjects = new List(); List selectedGameObjects = new List(); @@ -48,7 +48,6 @@ namespace XED.Util rtgController.onTransformChanged = OnTransformChangedFromRTG; uiLayer = LayerMask.NameToLayer("UI"); //var inputManager = FindSingle(); - selectIndex = 0; } diff --git a/Assets/Scripts/Studio/DataStructures.meta b/Assets/Scripts/Studio/DataStructures.meta new file mode 100644 index 00000000..fed7fa38 --- /dev/null +++ b/Assets/Scripts/Studio/DataStructures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd45805b3801a77459d273f3878e8073 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetData.cs b/Assets/Scripts/Studio/DataStructures/CustomAssetData.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/CustomAssetData.cs rename to Assets/Scripts/Studio/DataStructures/CustomAssetData.cs diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetData.cs.meta b/Assets/Scripts/Studio/DataStructures/CustomAssetData.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/CustomAssetData.cs.meta rename to Assets/Scripts/Studio/DataStructures/CustomAssetData.cs.meta diff --git a/Assets/Scripts/Studio/Common/KDTree.cs b/Assets/Scripts/Studio/DataStructures/KDTree.cs similarity index 99% rename from Assets/Scripts/Studio/Common/KDTree.cs rename to Assets/Scripts/Studio/DataStructures/KDTree.cs index c4534840..3ec02518 100644 --- a/Assets/Scripts/Studio/Common/KDTree.cs +++ b/Assets/Scripts/Studio/DataStructures/KDTree.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -namespace XED.Util +namespace XED.DataStructures { public class KDTree { diff --git a/Assets/Scripts/Studio/Common/KDTree.cs.meta b/Assets/Scripts/Studio/DataStructures/KDTree.cs.meta similarity index 100% rename from Assets/Scripts/Studio/Common/KDTree.cs.meta rename to Assets/Scripts/Studio/DataStructures/KDTree.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/SerializableMesh.cs b/Assets/Scripts/Studio/DataStructures/SerializableMesh.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SerializableMesh.cs rename to Assets/Scripts/Studio/DataStructures/SerializableMesh.cs diff --git a/Assets/Scripts/Studio/AssetTool/SerializableMesh.cs.meta b/Assets/Scripts/Studio/DataStructures/SerializableMesh.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SerializableMesh.cs.meta rename to Assets/Scripts/Studio/DataStructures/SerializableMesh.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/SerializableQuaternion.cs b/Assets/Scripts/Studio/DataStructures/SerializableQuaternion.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SerializableQuaternion.cs rename to Assets/Scripts/Studio/DataStructures/SerializableQuaternion.cs diff --git a/Assets/Scripts/Studio/AssetTool/SerializableQuaternion.cs.meta b/Assets/Scripts/Studio/DataStructures/SerializableQuaternion.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SerializableQuaternion.cs.meta rename to Assets/Scripts/Studio/DataStructures/SerializableQuaternion.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/SerializableVector2.cs b/Assets/Scripts/Studio/DataStructures/SerializableVector2.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SerializableVector2.cs rename to Assets/Scripts/Studio/DataStructures/SerializableVector2.cs diff --git a/Assets/Scripts/Studio/AssetTool/SerializableVector2.cs.meta b/Assets/Scripts/Studio/DataStructures/SerializableVector2.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SerializableVector2.cs.meta rename to Assets/Scripts/Studio/DataStructures/SerializableVector2.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/SerializableVector3.cs b/Assets/Scripts/Studio/DataStructures/SerializableVector3.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SerializableVector3.cs rename to Assets/Scripts/Studio/DataStructures/SerializableVector3.cs diff --git a/Assets/Scripts/Studio/AssetTool/SerializableVector3.cs.meta b/Assets/Scripts/Studio/DataStructures/SerializableVector3.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SerializableVector3.cs.meta rename to Assets/Scripts/Studio/DataStructures/SerializableVector3.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/SerializableVector4.cs b/Assets/Scripts/Studio/DataStructures/SerializableVector4.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SerializableVector4.cs rename to Assets/Scripts/Studio/DataStructures/SerializableVector4.cs diff --git a/Assets/Scripts/Studio/AssetTool/SerializableVector4.cs.meta b/Assets/Scripts/Studio/DataStructures/SerializableVector4.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SerializableVector4.cs.meta rename to Assets/Scripts/Studio/DataStructures/SerializableVector4.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/SubmeshData.cs b/Assets/Scripts/Studio/DataStructures/SubmeshData.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SubmeshData.cs rename to Assets/Scripts/Studio/DataStructures/SubmeshData.cs diff --git a/Assets/Scripts/Studio/AssetTool/SubmeshData.cs.meta b/Assets/Scripts/Studio/DataStructures/SubmeshData.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/SubmeshData.cs.meta rename to Assets/Scripts/Studio/DataStructures/SubmeshData.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/TextureData.cs b/Assets/Scripts/Studio/DataStructures/TextureData.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/TextureData.cs rename to Assets/Scripts/Studio/DataStructures/TextureData.cs diff --git a/Assets/Scripts/Studio/AssetTool/TextureData.cs.meta b/Assets/Scripts/Studio/DataStructures/TextureData.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/TextureData.cs.meta rename to Assets/Scripts/Studio/DataStructures/TextureData.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/ThumbnailData.cs b/Assets/Scripts/Studio/DataStructures/ThumbnailData.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/ThumbnailData.cs rename to Assets/Scripts/Studio/DataStructures/ThumbnailData.cs diff --git a/Assets/Scripts/Studio/AssetTool/ThumbnailData.cs.meta b/Assets/Scripts/Studio/DataStructures/ThumbnailData.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/ThumbnailData.cs.meta rename to Assets/Scripts/Studio/DataStructures/ThumbnailData.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/TransformData.cs b/Assets/Scripts/Studio/DataStructures/TransformData.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/TransformData.cs rename to Assets/Scripts/Studio/DataStructures/TransformData.cs diff --git a/Assets/Scripts/Studio/AssetTool/TransformData.cs.meta b/Assets/Scripts/Studio/DataStructures/TransformData.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/TransformData.cs.meta rename to Assets/Scripts/Studio/DataStructures/TransformData.cs.meta diff --git a/Assets/Scripts/Studio/Legacy/Building/ConvexHull.cs b/Assets/Scripts/Studio/Legacy/Building/ConvexHull.cs deleted file mode 100644 index 67efe3ee..00000000 --- a/Assets/Scripts/Studio/Legacy/Building/ConvexHull.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UIElements; - -namespace XED -{ - //ConvexHull이란 컨벡스 헐 알고리즘은 2차원 평면상에 여러개의 점이 있을 때 - //그 점 중에서 일부를 이용하여 볼록 다각형을 만들되 볼록 다각형 내부에 모든 점을 포함시키는 것을 의미한다. - //https://www.crocus.co.kr/1288 설명 참고 - //https://bloodstrawberry.tistory.com/1060 참고 - public class ConvexHull - { - private LinePoint firstLinePoint; - - private float CCWBy2D(Vector3 a, Vector3 b, Vector3 c) - { - var p = b - a; - var q = c - b; - - return Vector3.Cross(p, q).y; - } - - private int Compare(LinePoint a, LinePoint b) - { - var tmp = CCWBy2D(firstLinePoint.position, a.position, b.position); - if (tmp > 0) return -1; - else if(tmp == 0 && Vector3.Distance(firstLinePoint.position, a.position) GetConvexHullVertices(List point) - { - List convexHull = new(); - - int index, sp; - LinePoint[] stack = new LinePoint[point.Count]; - - index = sp = 0; - - stack[sp++] = point[index++]; - stack[sp++] = point[index++]; - - - while (sp < 3) - { - float tmp = CCWBy2D(stack[sp - 2].position, stack[sp - 1].position, point[index].position); - - if (tmp > 0) stack[sp++] = point[index++]; - else if (tmp == 0) // 직선인 경우는 점을 교체 - { - sp--; - stack[sp++] = point[index++]; - } - else index++; - } - - while (index < point.Count) - { - float tmp = CCWBy2D(stack[sp - 2].position, stack[sp - 1].position, point[index].position); - if (tmp > 0) stack[sp++] = point[index++]; - else sp--; - } - - for (int i = 0; i < sp; i++) convexHull.Add(stack[i]); - - return convexHull; - } - - public void RoomLinePoint(Room room) - { - List points = new(); - points = room.points; - firstLinePoint = room.firstPoints; - points.Sort(Compare); - - var sortPoint = GetConvexHullVertices(points); - room.points = points; - room.positions.Clear(); - foreach (var pos in points) - { - room.positions.Add(pos.position); - } - - // SetLineRenderer(lr, position, true); - } - - void SetLineRenderer(LineRenderer lr, List vertices, bool check) - { - lr.loop = check; - lr.positionCount = vertices.Count; - List position = new(); - foreach (LinePoint p in vertices) - { - position.Add(p.position); - } - lr.SetPositions(position.ToArray()); - } - } -} diff --git a/Assets/Scripts/Studio/Legacy/Building/ConvexHull.cs.meta b/Assets/Scripts/Studio/Legacy/Building/ConvexHull.cs.meta deleted file mode 100644 index af4f3689..00000000 --- a/Assets/Scripts/Studio/Legacy/Building/ConvexHull.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 67033d32a11ebd44e9706e0449ea9fa9 \ No newline at end of file diff --git a/Assets/Scripts/Studio/Managers/ObjectHandler.cs b/Assets/Scripts/Studio/Managers/ObjectHandler.cs deleted file mode 100644 index a93188fe..00000000 --- a/Assets/Scripts/Studio/Managers/ObjectHandler.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace XED.Manage -{ - public class ObjectHandler - { - public enum HandlingType - { - Normal, - Property, - } - - public HandlingType handlingType = HandlingType.Normal; - - public void SetHandlingType(HandlingType type) - { - handlingType = type; - - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Studio/Managers/ObjectHandler.cs.meta b/Assets/Scripts/Studio/Managers/ObjectHandler.cs.meta deleted file mode 100644 index ca996452..00000000 --- a/Assets/Scripts/Studio/Managers/ObjectHandler.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: a75f4b14385d88d46aeee45f7473f757 \ No newline at end of file diff --git a/Assets/Scripts/Studio/Managers/ProjectManager.cs b/Assets/Scripts/Studio/Managers/ProjectManager.cs index 0d3d6b34..eb58ece3 100644 --- a/Assets/Scripts/Studio/Managers/ProjectManager.cs +++ b/Assets/Scripts/Studio/Managers/ProjectManager.cs @@ -4,7 +4,7 @@ using System.Linq; using UnityEditor; using UnityEngine; using XED.Asset; -using XED.Hierarchy; +using XED.HierarchyTree; using XED.Util; using XRLib; diff --git a/Assets/Scripts/Studio/TwinObject/TwinCAD.cs b/Assets/Scripts/Studio/TwinObject/TwinCAD.cs deleted file mode 100644 index 46e42f0d..00000000 --- a/Assets/Scripts/Studio/TwinObject/TwinCAD.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace XED -{ - public class TwinCAD: TwinObject - { - } -} \ No newline at end of file diff --git a/Assets/Scripts/Studio/TwinObject/TwinCAD.cs.meta b/Assets/Scripts/Studio/TwinObject/TwinCAD.cs.meta deleted file mode 100644 index 5c1ed1dd..00000000 --- a/Assets/Scripts/Studio/TwinObject/TwinCAD.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: c1c1c29051c0b3946bbd924be0c36ae5 \ No newline at end of file diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs index 3a1905cd..05edd157 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs @@ -1,6 +1,6 @@ using UnityEngine; using XRLib.UI; -using XED.Hierarchy; +using XED.HierarchyTree; using UnityEngine.UI; namespace XED.UI diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs index 10ac5079..dbdf71c9 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.UI; -using XED.Hierarchy; +using XED.HierarchyTree; using XED.Util; using XRLib.UI; using static XED.UI.Panel_PredefinedType; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_Hierarchy.cs b/Assets/Scripts/Studio/UI/Panel/Panel_Hierarchy.cs index 547e2195..43f336c8 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_Hierarchy.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_Hierarchy.cs @@ -1,7 +1,7 @@ using UnityEngine; using XRLib.UI; using XED.Core; -using XED.Hierarchy; +using XED.HierarchyTree; using UnityEngine.UI; namespace XED.UI diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_InterworkingDataList.cs b/Assets/Scripts/Studio/UI/Panel/Panel_InterworkingDataList.cs index 1568b085..936f479e 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_InterworkingDataList.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_InterworkingDataList.cs @@ -1,6 +1,6 @@ using UnityEngine; using UnityEngine.UI; -using XED.Hierarchy; +using XED.HierarchyTree; using XRLib.UI; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_Thumbnail.cs b/Assets/Scripts/Studio/UI/Panel/Panel_Thumbnail.cs index 6d1e9791..6dc0278f 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_Thumbnail.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_Thumbnail.cs @@ -3,7 +3,7 @@ using System; using UnityEngine; using UnityEngine.UI; using UnityEngine.UIElements; -using XED.Hierarchy; +using XED.HierarchyTree; using XED.Util; using XRLib.UI; diff --git a/Assets/Scripts/Studio/UI/TreeView/CustomScrollRect.cs b/Assets/Scripts/Studio/UI/TreeView/CustomScrollRect.cs index a102d534..c37266c7 100644 --- a/Assets/Scripts/Studio/UI/TreeView/CustomScrollRect.cs +++ b/Assets/Scripts/Studio/UI/TreeView/CustomScrollRect.cs @@ -7,7 +7,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using XED.UI; -namespace XED.Hierarchy +namespace XED.HierarchyTree { public class CustomScrollRect : ScrollRect, IPointerDownHandler, IPointerUpHandler, IPointerExitHandler { diff --git a/Assets/Scripts/Studio/UI/TreeView/HierachyItem.cs b/Assets/Scripts/Studio/UI/TreeView/HierachyItem.cs index e072665b..b5d174d1 100644 --- a/Assets/Scripts/Studio/UI/TreeView/HierachyItem.cs +++ b/Assets/Scripts/Studio/UI/TreeView/HierachyItem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; -namespace XED.Hierarchy +namespace XED.HierarchyTree { public enum HierarchyItemType { diff --git a/Assets/Scripts/Studio/UI/TreeView/PooledScrollView.cs b/Assets/Scripts/Studio/UI/TreeView/PooledScrollView.cs index 85e9c192..f4471944 100644 --- a/Assets/Scripts/Studio/UI/TreeView/PooledScrollView.cs +++ b/Assets/Scripts/Studio/UI/TreeView/PooledScrollView.cs @@ -4,8 +4,9 @@ using UnityEngine.Pool; using UnityEngine.Events; using TMPro; using XED.Manage; +using Unity.Hierarchy; -namespace XED.Hierarchy +namespace XED.HierarchyTree { public class PooledScrollView : MonoBehaviour { @@ -15,9 +16,6 @@ namespace XED.Hierarchy private TMP_InputField searchInput; //private Button searchCancelButton; private GameObject itemPrefab; // Prefab for scroll items. - private UnityEvent onPointerDown; - private UnityEvent onDragAndDrop; - private ObjectPool pool; // Pool for UI items. private List data = new List(); // The list of hierarchy items. private HierarchyItem root; diff --git a/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewItem.cs b/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewItem.cs index c73455c3..ee661bf8 100644 --- a/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewItem.cs +++ b/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewItem.cs @@ -5,7 +5,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using TMPro; -namespace XED.Hierarchy +namespace XED.HierarchyTree { public class PopupScrollViewItem : UnityEngine.MonoBehaviour { diff --git a/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewMenu.cs b/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewMenu.cs index 56ef43e6..dc39a408 100644 --- a/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewMenu.cs +++ b/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewMenu.cs @@ -1,6 +1,6 @@ using TMPro; using UnityEngine; -using XED.Hierarchy; +using XED.HierarchyTree; namespace XED.UI { diff --git a/Assets/Scripts/Studio/UI/TreeView/ScrollItemUI.cs b/Assets/Scripts/Studio/UI/TreeView/ScrollItemUI.cs index 0cc9046b..1c743a3a 100644 --- a/Assets/Scripts/Studio/UI/TreeView/ScrollItemUI.cs +++ b/Assets/Scripts/Studio/UI/TreeView/ScrollItemUI.cs @@ -8,7 +8,7 @@ using UnityEngine.Events; using System; using XRLib; -namespace XED.Hierarchy +namespace XED.HierarchyTree { public class ScrollItemUI : UnityEngine.MonoBehaviour, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler//, IBeginDragHandler, IEndDragHandler, { diff --git a/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs b/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs index 539cd9c7..b24fe767 100644 --- a/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs +++ b/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs @@ -4,14 +4,14 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using XRLib.UI; using XED.Asset; -using XED.Hierarchy; +using XED.HierarchyTree; namespace XED.UI { public class ScrollViewMenu_ImportExport : PanelBase, IDeselectHandler { private Canvas canvas; - private CustomScrollRect scrollRect; + private XED.HierarchyTree.CustomScrollRect scrollRect; private Button btnExport; private Button btnImport; private Selectable selectable; diff --git a/Assets/Scripts/Studio/Utility.meta b/Assets/Scripts/Studio/Utility.meta new file mode 100644 index 00000000..d0edf985 --- /dev/null +++ b/Assets/Scripts/Studio/Utility.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04e4e80cfce7eeb499a5e83fbc4ea615 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Studio/Common/ConvexHullCalculator.cs b/Assets/Scripts/Studio/Utility/ConvexHullCalculator.cs similarity index 100% rename from Assets/Scripts/Studio/Common/ConvexHullCalculator.cs rename to Assets/Scripts/Studio/Utility/ConvexHullCalculator.cs diff --git a/Assets/Scripts/Studio/Common/ConvexHullCalculator.cs.meta b/Assets/Scripts/Studio/Utility/ConvexHullCalculator.cs.meta similarity index 100% rename from Assets/Scripts/Studio/Common/ConvexHullCalculator.cs.meta rename to Assets/Scripts/Studio/Utility/ConvexHullCalculator.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/TextureUtil.cs b/Assets/Scripts/Studio/Utility/TextureUtil.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/TextureUtil.cs rename to Assets/Scripts/Studio/Utility/TextureUtil.cs diff --git a/Assets/Scripts/Studio/AssetTool/TextureUtil.cs.meta b/Assets/Scripts/Studio/Utility/TextureUtil.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/TextureUtil.cs.meta rename to Assets/Scripts/Studio/Utility/TextureUtil.cs.meta diff --git a/Assets/legacy/Scripts/HierarchyTree.cs b/Assets/legacy/Scripts/HierarchyTree.cs index d082e3f9..9d16e080 100644 --- a/Assets/legacy/Scripts/HierarchyTree.cs +++ b/Assets/legacy/Scripts/HierarchyTree.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.PlayerLoop; using XRLib; -namespace XED +namespace XED.Hierarchy { public class HierarchyTree {