From c8d50f90339d6ea2f24b0cc31a1638aefbe1e090 Mon Sep 17 00:00:00 2001 From: wsh Date: Thu, 22 May 2025 10:18:44 +0900 Subject: [PATCH] =?UTF-8?q?=EB=84=A4=EC=9E=84=EC=8A=A4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=8A=A4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/CustomMessagePackResolver.cs | 10 +- .../Scripts/GeneratedMessagePackResolver.cs | 100 +++++++-------- .../Studio/AssetTool/CustomAssetConnector.cs | 2 +- .../AssetTool/CustomAssetDataHandler.cs | 4 +- .../AssetTool/CustomAssetEventHandler.cs | 2 +- .../AssetTool/CustomAssetRenderObject.cs | 2 +- .../Studio/AssetTool/DirectorySearch.cs | 73 ----------- .../Studio/AssetTool/DirectorySearch.cs.meta | 11 -- .../Studio/AssetTool/FBXFileManager.cs | 5 +- .../Studio/AssetTool/MaterialPropertyData.cs | 2 +- Assets/Scripts/Studio/AssetTool/ModelData.cs | 3 +- Assets/Scripts/Studio/AssetTool/ObjectSnap.cs | 2 +- .../Studio/AssetTool/RenderObjectHandler.cs | 4 +- Assets/Scripts/Studio/AssetTool/SaveData.cs | 3 +- .../Studio/AssetTool/SavedModelData.cs | 3 +- .../Studio/AssetTool/SharedMaterial.cs | 3 +- .../TextureData.cs | 2 +- .../TextureData.cs.meta | 0 .../TwinObjectPreprocessingHelper.cs | 120 ------------------ .../TwinObjectPreprocessingHelper.cs.meta | 2 - .../CameraCommand/MoveToTargetCommand.cs | 2 +- .../Command/CreateConnectedAssetCommand.cs | 2 +- .../FileCommand/LoadLocalModelDataCommand.cs | 2 +- .../LoadLocalTextureDataCommand.cs | 1 + .../GizmoCommand/ActivateMoveGizmoCommand.cs | 1 + .../ActivateRotateGizmoCommand.cs | 1 + .../GizmoCommand/ActivateScaleGizmoCommand.cs | 1 + .../Command/GizmoCommand/ResetGizmoCommand.cs | 1 + .../ObjectCommand/CopyObjectCommand.cs | 2 +- .../ObjectCommand/RemoveAllObjectCommand.cs | 2 +- .../RemoveSelectObjectCommand.cs | 2 +- .../ProjectCommand/LoadProjectCommand.cs | 2 +- .../ProjectCommand/NewProjectCommand.cs | 2 +- .../ProjectCommand/SaveProjectCommand.cs | 2 +- Assets/Scripts/Studio/Core/SystemMain.cs | 2 +- .../Studio/DataStructures/ThumbnailData.cs | 2 +- Assets/Scripts/Studio/Managers/ManagerHub.cs | 2 +- .../Scripts/Studio/Managers/ProjectManager.cs | 2 +- .../Studio/Service/AssetDataService.cs | 2 +- .../Studio/UI/Canvas/Canvas_DragArea.cs | 2 +- .../Scripts/Studio/UI/Canvas/Canvas_Popup.cs | 1 + .../Scripts/Studio/UI/Canvas/Canvas_Static.cs | 1 + .../Studio/UI/Panel/Panel_ObjectAlign.cs | 2 +- .../Studio/UI/Panel/Panel_ObjectDistance.cs | 1 + .../UI/TreeView/AssetLibraryScrollItemUI.cs | 1 + .../TreeView/ScrollViewMenu_ImportExport.cs | 2 +- Assets/Test/AGVNode/AGVNodeManager.cs | 2 +- 47 files changed, 103 insertions(+), 295 deletions(-) delete mode 100644 Assets/Scripts/Studio/AssetTool/DirectorySearch.cs delete mode 100644 Assets/Scripts/Studio/AssetTool/DirectorySearch.cs.meta rename Assets/Scripts/Studio/{DataStructures => AssetTool}/TextureData.cs (94%) rename Assets/Scripts/Studio/{DataStructures => AssetTool}/TextureData.cs.meta (100%) delete mode 100644 Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs delete mode 100644 Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs.meta diff --git a/Assets/Scripts/CustomMessagePackResolver.cs b/Assets/Scripts/CustomMessagePackResolver.cs index bc2060ea..3dfeee2d 100644 --- a/Assets/Scripts/CustomMessagePackResolver.cs +++ b/Assets/Scripts/CustomMessagePackResolver.cs @@ -10,16 +10,16 @@ public class CustomMessagePackResolver : IFormatterResolver private static readonly Dictionary formatters = new Dictionary { - { typeof(Studio.Manage.MaterialPropertyData), new MessagePack.Formatters.XED.Manage.MaterialPropertyDataFormatter() }, - { typeof(Studio.Manage.ModelData), new MessagePack.Formatters.XED.Manage.ModelDataFormatter() }, - { typeof(Studio.Manage.SaveData), new MessagePack.Formatters.XED.Manage.SaveDataFormatter() }, - { typeof(Studio.Manage.SavedModelData), new MessagePack.Formatters.XED.Manage.SavedModelDataFormatter() }, + { typeof(Studio.AssetTool.MaterialPropertyData), new MessagePack.Formatters.XED.Manage.MaterialPropertyDataFormatter() }, + { typeof(Studio.AssetTool.ModelData), new MessagePack.Formatters.XED.Manage.ModelDataFormatter() }, + { typeof(Studio.AssetTool.SaveData), new MessagePack.Formatters.XED.Manage.SaveDataFormatter() }, + { typeof(Studio.AssetTool.SavedModelData), new MessagePack.Formatters.XED.Manage.SavedModelDataFormatter() }, { typeof(Studio.Manage.SerializableMesh), new MessagePack.Formatters.XED.Manage.SerializableMeshFormatter() }, { typeof(Studio.Manage.SerializableQuaternion), new MessagePack.Formatters.XED.Manage.SerializableQuaternionFormatter() }, { typeof(Studio.Manage.SerializableVector2), new MessagePack.Formatters.XED.Manage.SerializableVector2Formatter() }, { typeof(Studio.Manage.SerializableVector3), new MessagePack.Formatters.XED.Manage.SerializableVector3Formatter() }, { typeof(Studio.Manage.SubmeshData), new MessagePack.Formatters.XED.Manage.SubmeshDataFormatter() }, - { typeof(Studio.Manage.TextureData), new MessagePack.Formatters.XED.Manage.TextureDataFormatter() }, + { typeof(Studio.AssetTool.TextureData), new MessagePack.Formatters.XED.Manage.TextureDataFormatter() }, { typeof(Studio.Manage.TransformData), new MessagePack.Formatters.XED.Manage.TransformDataFormatter() }, }; diff --git a/Assets/Scripts/GeneratedMessagePackResolver.cs b/Assets/Scripts/GeneratedMessagePackResolver.cs index 4c087db5..7f8ef56c 100644 --- a/Assets/Scripts/GeneratedMessagePackResolver.cs +++ b/Assets/Scripts/GeneratedMessagePackResolver.cs @@ -49,28 +49,28 @@ namespace MessagePack.Resolvers { lookup = new global::System.Collections.Generic.Dictionary(23) { - { typeof(global::Studio.Manage.MaterialPropertyData[]), 0 }, - { typeof(global::Studio.Manage.ModelData[]), 1 }, - { typeof(global::Studio.Manage.SavedModelData[]), 2 }, + { typeof(global::Studio.AssetTool.MaterialPropertyData[]), 0 }, + { typeof(global::Studio.AssetTool.ModelData[]), 1 }, + { typeof(global::Studio.AssetTool.SavedModelData[]), 2 }, { typeof(global::Studio.Manage.SerializableVector2[]), 3 }, { typeof(global::Studio.Manage.SerializableVector3[]), 4 }, { typeof(global::Studio.Manage.SerializableVector4[]), 5 }, { typeof(global::Studio.Manage.SubmeshData[]), 6 }, - { typeof(global::Studio.Manage.TextureData[]), 7 }, - { typeof(global::Studio.Manage.ThumbnailData[]), 8 }, + { typeof(global::Studio.AssetTool.TextureData[]), 7 }, + { typeof(global::Studio.AssetTool.ThumbnailData[]), 8 }, { typeof(string[][]), 9 }, - { typeof(global::Studio.Manage.MaterialPropertyData), 10 }, - { typeof(global::Studio.Manage.ModelData), 11 }, - { typeof(global::Studio.Manage.SaveData), 12 }, - { typeof(global::Studio.Manage.SavedModelData), 13 }, + { typeof(global::Studio.AssetTool.MaterialPropertyData), 10 }, + { typeof(global::Studio.AssetTool.ModelData), 11 }, + { typeof(global::Studio.AssetTool.SaveData), 12 }, + { typeof(global::Studio.AssetTool.SavedModelData), 13 }, { typeof(global::Studio.Manage.SerializableMesh), 14 }, { typeof(global::Studio.Manage.SerializableQuaternion), 15 }, { typeof(global::Studio.Manage.SerializableVector2), 16 }, { typeof(global::Studio.Manage.SerializableVector3), 17 }, { typeof(global::Studio.Manage.SerializableVector4), 18 }, { typeof(global::Studio.Manage.SubmeshData), 19 }, - { typeof(global::Studio.Manage.TextureData), 20 }, - { typeof(global::Studio.Manage.ThumbnailData), 21 }, + { typeof(global::Studio.AssetTool.TextureData), 20 }, + { typeof(global::Studio.AssetTool.ThumbnailData), 21 }, { typeof(global::Studio.Manage.TransformData), 22 }, }; } @@ -85,15 +85,15 @@ namespace MessagePack.Resolvers switch (key) { - case 0: return new global::MessagePack.Formatters.ArrayFormatter(); - case 1: return new global::MessagePack.Formatters.ArrayFormatter(); - case 2: return new global::MessagePack.Formatters.ArrayFormatter(); + case 0: return new global::MessagePack.Formatters.ArrayFormatter(); + case 1: return new global::MessagePack.Formatters.ArrayFormatter(); + case 2: return new global::MessagePack.Formatters.ArrayFormatter(); case 3: return new global::MessagePack.Formatters.ArrayFormatter(); case 4: return new global::MessagePack.Formatters.ArrayFormatter(); case 5: return new global::MessagePack.Formatters.ArrayFormatter(); case 6: return new global::MessagePack.Formatters.ArrayFormatter(); - case 7: return new global::MessagePack.Formatters.ArrayFormatter(); - case 8: return new global::MessagePack.Formatters.ArrayFormatter(); + case 7: return new global::MessagePack.Formatters.ArrayFormatter(); + case 8: return new global::MessagePack.Formatters.ArrayFormatter(); case 9: return new global::MessagePack.Formatters.ArrayFormatter(); case 10: return new MessagePack.Formatters.XED.Manage.MaterialPropertyDataFormatter(); case 11: return new MessagePack.Formatters.XED.Manage.ModelDataFormatter(); @@ -143,10 +143,10 @@ namespace MessagePack.Resolvers namespace MessagePack.Formatters.XED.Manage { - public sealed class MaterialPropertyDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class MaterialPropertyDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.MaterialPropertyData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.AssetTool.MaterialPropertyData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -169,7 +169,7 @@ namespace MessagePack.Formatters.XED.Manage global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.texUIDs, options); } - public global::Studio.Manage.MaterialPropertyData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.AssetTool.MaterialPropertyData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -179,7 +179,7 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; var length = reader.ReadArrayHeader(); - var ____result = new global::Studio.Manage.MaterialPropertyData(); + var ____result = new global::Studio.AssetTool.MaterialPropertyData(); for (int i = 0; i < length; i++) { @@ -229,10 +229,10 @@ namespace MessagePack.Formatters.XED.Manage } } - public sealed class ModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class ModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.ModelData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.AssetTool.ModelData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -247,10 +247,10 @@ namespace MessagePack.Formatters.XED.Manage global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.modelComponentName, options); global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.transformData, options); global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.mesh, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.materialProperties, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.materialProperties, options); } - public global::Studio.Manage.ModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.AssetTool.ModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -260,7 +260,7 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; var length = reader.ReadArrayHeader(); - var ____result = new global::Studio.Manage.ModelData(); + var ____result = new global::Studio.AssetTool.ModelData(); for (int i = 0; i < length; i++) { @@ -282,7 +282,7 @@ namespace MessagePack.Formatters.XED.Manage ____result.mesh = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 5: - ____result.materialProperties = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.materialProperties = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; default: reader.Skip(); @@ -295,10 +295,10 @@ namespace MessagePack.Formatters.XED.Manage } } - public sealed class SaveDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class SaveDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.SaveData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.AssetTool.SaveData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -308,12 +308,12 @@ namespace MessagePack.Formatters.XED.Manage global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; writer.WriteArrayHeader(3); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.modelDatas, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.textureDatas, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.thumbnailDatas, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.modelDatas, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.textureDatas, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.thumbnailDatas, options); } - public global::Studio.Manage.SaveData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.AssetTool.SaveData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -323,20 +323,20 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; var length = reader.ReadArrayHeader(); - var ____result = new global::Studio.Manage.SaveData(); + var ____result = new global::Studio.AssetTool.SaveData(); for (int i = 0; i < length; i++) { switch (i) { case 0: - ____result.modelDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.modelDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 1: - ____result.textureDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.textureDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 2: - ____result.thumbnailDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.thumbnailDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; default: reader.Skip(); @@ -349,10 +349,10 @@ namespace MessagePack.Formatters.XED.Manage } } - public sealed class SavedModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class SavedModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.SavedModelData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.AssetTool.SavedModelData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -363,10 +363,10 @@ namespace MessagePack.Formatters.XED.Manage global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; writer.WriteArrayHeader(2); global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.attributes, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.models, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.models, options); } - public global::Studio.Manage.SavedModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.AssetTool.SavedModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -376,7 +376,7 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; var length = reader.ReadArrayHeader(); - var ____result = new global::Studio.Manage.SavedModelData(); + var ____result = new global::Studio.AssetTool.SavedModelData(); for (int i = 0; i < length; i++) { @@ -386,7 +386,7 @@ namespace MessagePack.Formatters.XED.Manage ____result.attributes = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 1: - ____result.models = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.models = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; default: reader.Skip(); @@ -708,10 +708,10 @@ namespace MessagePack.Formatters.XED.Manage } } - public sealed class TextureDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class TextureDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.TextureData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.AssetTool.TextureData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -726,7 +726,7 @@ namespace MessagePack.Formatters.XED.Manage writer.Write(value.data); } - public global::Studio.Manage.TextureData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.AssetTool.TextureData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -759,16 +759,16 @@ namespace MessagePack.Formatters.XED.Manage } } - var ____result = new global::Studio.Manage.TextureData(__name__, __uid__, __data__); + var ____result = new global::Studio.AssetTool.TextureData(__name__, __uid__, __data__); reader.Depth--; return ____result; } } - public sealed class ThumbnailDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class ThumbnailDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.ThumbnailData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.AssetTool.ThumbnailData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -780,7 +780,7 @@ namespace MessagePack.Formatters.XED.Manage writer.Write(value.data); } - public global::Studio.Manage.ThumbnailData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.AssetTool.ThumbnailData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -804,7 +804,7 @@ namespace MessagePack.Formatters.XED.Manage } } - var ____result = new global::Studio.Manage.ThumbnailData(__data__); + var ____result = new global::Studio.AssetTool.ThumbnailData(__data__); reader.Depth--; return ____result; } diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index 9d8e9686..48d18d76 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -13,7 +13,7 @@ using Studio.Core; using System.Collections; using Studio.AssetLibraryTree; -namespace Studio.Asset +namespace Studio.AssetTool { public class CustomAssetConnector : Manager { diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs index f8ad295d..61b87031 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs @@ -1,10 +1,10 @@ -using Studio.Asset; +using Studio.AssetTool; using Studio.AssetLibraryTree; using Studio.HierarchyTree; using Studio.Manage; using Studio.Util; -namespace Studio +namespace Studio.AssetTool { public class CustomAssetDataHandler { diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs index 740f1690..dcd96fbd 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs @@ -7,7 +7,7 @@ using Studio.HierarchyTree; using Studio.Manage; using Studio.Util; -namespace Studio.Asset +namespace Studio.AssetTool { public class CustomAssetEventHandler { diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs index f4b74197..3935118f 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs @@ -7,7 +7,7 @@ using UnityEngine.EventSystems; using Studio.DataStructures; using Studio.UI; -namespace Studio.Util +namespace Studio.AssetTool { public class CustomAssetRenderObject : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler { diff --git a/Assets/Scripts/Studio/AssetTool/DirectorySearch.cs b/Assets/Scripts/Studio/AssetTool/DirectorySearch.cs deleted file mode 100644 index 2dfebac0..00000000 --- a/Assets/Scripts/Studio/AssetTool/DirectorySearch.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using UnityEngine; - -namespace Studio -{ - public class DirectorySearch - { - private float maxFileSize;//MB단위 - private List folders = new(); - - public DirectorySearch(float maxFileSize) - { - this.maxFileSize = maxFileSize; - } - - public List SearchDirectory(string dirpath) - { - folders.Clear(); - var info = new DirectoryInfo(dirpath); - CreateFolderItem(info); - GetDirectoryInPath(info); - - return folders; - } - void GetDirectoryInPath(DirectoryInfo info) - { - var dirInfo = info.GetDirectories(); - foreach (var dir in dirInfo) - { - CreateFolderItem(dir); - if (dir.GetDirectories().Length > 0) - { - GetDirectoryInPath(dir); - } - } - } - - void CreateFolderItem(DirectoryInfo dir) - { - folders.Add(dir); - } - - public List GetFilesInPath(DirectoryInfo info) - { - var fileInfo = GetFilesByExtensions(info, new string[] { ".FBX", ".OBJ", ".GLTF2", ".STL", ".PLY", ".3MF", ".DAE" }); - var satisfyFiles = IsOverFileSize(fileInfo); - var files = new List(); - foreach (var file in satisfyFiles) - { - files.Add(file); - } - - return files; - } - - IEnumerable GetFilesByExtensions(DirectoryInfo dir, params string[] extensions) - { - if (extensions == null) - throw new ArgumentNullException("extensions"); - IEnumerable files = dir.EnumerateFiles(); - return files.Where(f => extensions.Contains(f.Extension, StringComparer.OrdinalIgnoreCase)); - } - - IEnumerable IsOverFileSize(IEnumerable files) - { - var satisfyFile = files.Where(f => f.Length / Mathf.Pow(1024f, 2f) < maxFileSize); - return satisfyFile; - } - } -} diff --git a/Assets/Scripts/Studio/AssetTool/DirectorySearch.cs.meta b/Assets/Scripts/Studio/AssetTool/DirectorySearch.cs.meta deleted file mode 100644 index 449d1fdd..00000000 --- a/Assets/Scripts/Studio/AssetTool/DirectorySearch.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a99fa57281907424d971e68860da2248 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs b/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs index ebbd08bb..d6e96581 100644 --- a/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs +++ b/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs @@ -9,11 +9,12 @@ using System.Threading.Tasks; using System; using System.Linq; using Studio.Repositories; -using Studio.Asset; +using Studio.AssetTool; using Ookii.Dialogs; using Studio.Command; +using Studio.Manage; -namespace Studio.Manage +namespace Studio.AssetTool { public class FBXFileManager : Manager { diff --git a/Assets/Scripts/Studio/AssetTool/MaterialPropertyData.cs b/Assets/Scripts/Studio/AssetTool/MaterialPropertyData.cs index b3d4ab15..556164e7 100644 --- a/Assets/Scripts/Studio/AssetTool/MaterialPropertyData.cs +++ b/Assets/Scripts/Studio/AssetTool/MaterialPropertyData.cs @@ -1,7 +1,7 @@ using MessagePack; using UnityEngine; -namespace Studio.Manage +namespace Studio.AssetTool { [MessagePackObject] public class MaterialPropertyData diff --git a/Assets/Scripts/Studio/AssetTool/ModelData.cs b/Assets/Scripts/Studio/AssetTool/ModelData.cs index 35ae46c6..d1469a5c 100644 --- a/Assets/Scripts/Studio/AssetTool/ModelData.cs +++ b/Assets/Scripts/Studio/AssetTool/ModelData.cs @@ -1,6 +1,7 @@ using MessagePack; +using Studio.Manage; -namespace Studio.Manage +namespace Studio.AssetTool { [MessagePackObject] public class ModelData diff --git a/Assets/Scripts/Studio/AssetTool/ObjectSnap.cs b/Assets/Scripts/Studio/AssetTool/ObjectSnap.cs index 6c550311..9e1d5810 100644 --- a/Assets/Scripts/Studio/AssetTool/ObjectSnap.cs +++ b/Assets/Scripts/Studio/AssetTool/ObjectSnap.cs @@ -1,7 +1,7 @@ using System.Collections; using UnityEngine; -namespace Studio.Util +namespace Studio.AssetTool { public class ObjectSnap : MonoBehaviour { diff --git a/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs b/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs index 757ee559..ea3de0a0 100644 --- a/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs @@ -4,14 +4,14 @@ using System.Linq; using UnityEditor; using UnityEngine; using UnityEngine.EventSystems; -using Studio.Asset; +using Studio.AssetTool; using Studio.Command; using Studio.DataStructures; using Studio.Interfaces; using Studio.Manage; using Studio.RuntimeGizmo; -namespace Studio.Util +namespace Studio.AssetTool { public class RenderObjectHandler : Manager, IModeController, IInputHandler { diff --git a/Assets/Scripts/Studio/AssetTool/SaveData.cs b/Assets/Scripts/Studio/AssetTool/SaveData.cs index bfa600b2..2d9e0cae 100644 --- a/Assets/Scripts/Studio/AssetTool/SaveData.cs +++ b/Assets/Scripts/Studio/AssetTool/SaveData.cs @@ -1,6 +1,7 @@ using MessagePack; +using Studio.Manage; -namespace Studio.Manage +namespace Studio.AssetTool { [MessagePackObject] public class SaveData diff --git a/Assets/Scripts/Studio/AssetTool/SavedModelData.cs b/Assets/Scripts/Studio/AssetTool/SavedModelData.cs index bd2ca244..42da9a53 100644 --- a/Assets/Scripts/Studio/AssetTool/SavedModelData.cs +++ b/Assets/Scripts/Studio/AssetTool/SavedModelData.cs @@ -1,9 +1,10 @@ using MessagePack; +using Studio.Manage; using System.Collections.Generic; using System.Linq; using UnityEngine; -namespace Studio.Manage +namespace Studio.AssetTool { [MessagePackObject] public class SavedModelData diff --git a/Assets/Scripts/Studio/AssetTool/SharedMaterial.cs b/Assets/Scripts/Studio/AssetTool/SharedMaterial.cs index 2f516c28..e6a8752e 100644 --- a/Assets/Scripts/Studio/AssetTool/SharedMaterial.cs +++ b/Assets/Scripts/Studio/AssetTool/SharedMaterial.cs @@ -1,8 +1,9 @@ +using Studio.Manage; using System; using System.Collections.Generic; using UnityEngine; -namespace Studio.Manage +namespace Studio.AssetTool { public class SharedMaterial { diff --git a/Assets/Scripts/Studio/DataStructures/TextureData.cs b/Assets/Scripts/Studio/AssetTool/TextureData.cs similarity index 94% rename from Assets/Scripts/Studio/DataStructures/TextureData.cs rename to Assets/Scripts/Studio/AssetTool/TextureData.cs index c6161a79..f674bfa6 100644 --- a/Assets/Scripts/Studio/DataStructures/TextureData.cs +++ b/Assets/Scripts/Studio/AssetTool/TextureData.cs @@ -1,6 +1,6 @@ using MessagePack; -namespace Studio.Manage +namespace Studio.AssetTool { [MessagePackObject] diff --git a/Assets/Scripts/Studio/DataStructures/TextureData.cs.meta b/Assets/Scripts/Studio/AssetTool/TextureData.cs.meta similarity index 100% rename from Assets/Scripts/Studio/DataStructures/TextureData.cs.meta rename to Assets/Scripts/Studio/AssetTool/TextureData.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs b/Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs deleted file mode 100644 index 6e6f9620..00000000 --- a/Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs +++ /dev/null @@ -1,120 +0,0 @@ -using UnityEngine; -using UnityEditor; -using System.IO; -using System.Collections.Generic; -using System.Threading.Tasks; -#if UNITY_EDITOR -using UnityEditor.AddressableAssets.Settings; -using UnityEditor.AddressableAssets; -#endif - -namespace Studio -{ - public class TwinObjectPreprocessingHelper - { - static List twinContainerList = new(); - -#if UNITY_EDITOR - [MenuItem("Tools/TwinObjectsSetting")] - public static void TwinObjectsSetting() - { - AutomateTwinObjectSetup(); - } - - - //TODO : 경로를 하드코딩 하는 방식 이외의 다른 방식 활용, Prefab 의 이름 파싱을 이용한 방식 활용(PRF_Robot01_Robot) - static void AutomateTwinObjectSetup() - { - var mainPath = "C:/Users/UVC_JYM/Desktop/Test"; - var beforePath = string.Concat(mainPath, "TwinObject_BeforeProcessing"); - var afterPath = string.Concat(mainPath, "TwinObject_AfterProcessing/"); - string etcPath = string.Concat(mainPath, "$etc"); - - CreateAddressableAssets(beforePath, etcPath, afterPath); - } - static void CreateAddressableAssets(string beforePath, string etcPath, string afterPath) - { - //beforPath 폴더 안의 타입이 프리팹인 Asset의 guid를 모두 찾습니다. - string[] guids = AssetDatabase.FindAssets("t:Prefab", new string[] { beforePath }); - - foreach (var guid in guids) - { - //guid 에 해당하는 Asset 의 경로를 찾습니다. - string filePath = AssetDatabase.GUIDToAssetPath(guid); - - if (filePath.StartsWith(etcPath)) - { - continue; - } - - //경로에 해당하는 Asset 을 찾습니다. - var loadAsset = AssetDatabase.LoadAssetAtPath(filePath); - var twinObject = loadAsset.GetComponent(); - - string fileName = Path.GetFileName(filePath); - string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(filePath); - string folderPath = string.Concat(afterPath, fileNameWithoutExtension); - string fullPath = string.Concat(folderPath, "/", fileName); - - - //TwinObject 미리보기 이미지를 생성합니다. - var texture = CreateTwinObjectPortrait(folderPath, twinObject); - } - } - - - static Texture2D CreateTwinObjectPortrait(string folderPath, TwinObject twinObject) - { - Texture2D thumbnailTexture = null; - - //미리보기 텍스처 생성 - while (thumbnailTexture == null) - { - thumbnailTexture = AssetPreview.GetAssetPreview(twinObject.gameObject); - System.Threading.Thread.Sleep(5); - } - - var transparentTexture = BackgroundTransparencyProcess(thumbnailTexture); - //텍스처 저장 - transparentTexture.name = string.Concat("Texture_", twinObject.name); - byte[] bytes = transparentTexture.EncodeToPNG(); - string filePath = string.Concat(folderPath, "/", transparentTexture.name, ".png"); - - File.WriteAllBytes(filePath, bytes); - AssetDatabase.Refresh(); - - //텍스처 불러오기 - var texture = AssetDatabase.LoadAssetAtPath(filePath); - return texture; - } - - static Texture2D BackgroundTransparencyProcess(Texture2D texture) - { - var transparentTexture = new Texture2D(texture.width, texture.height); - transparentTexture.SetPixels(texture.GetPixels()); - - for (int h = 0; h < texture.height; h++) - { - for (int w = 0; w < texture.width; w++) - { - transparentTexture.SetPixel(w, h, Color.clear); - - if (texture.GetPixel(w, h) != texture.GetPixel(w + 1, h)) - break; - } - - for (int w = texture.width; w > 0; w--) - { - transparentTexture.SetPixel(w, h, Color.clear); - - if (texture.GetPixel(w, h) != texture.GetPixel(w - 1, h)) - break; - } - } - - transparentTexture.Apply(); - return transparentTexture; - } -#endif - } -} diff --git a/Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs.meta b/Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs.meta deleted file mode 100644 index 8d167873..00000000 --- a/Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: f47017ab9520f8844869029ec454f90b \ No newline at end of file diff --git a/Assets/Scripts/Studio/Command/CameraCommand/MoveToTargetCommand.cs b/Assets/Scripts/Studio/Command/CameraCommand/MoveToTargetCommand.cs index 2ffae2b7..7b68001a 100644 --- a/Assets/Scripts/Studio/Command/CameraCommand/MoveToTargetCommand.cs +++ b/Assets/Scripts/Studio/Command/CameraCommand/MoveToTargetCommand.cs @@ -1,6 +1,6 @@ using System.IO; using UnityEngine; -using Studio.Asset; +using Studio.AssetTool; using Studio.Command; using Studio.Manage; diff --git a/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs b/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs index 2fc8004d..df2c4d66 100644 --- a/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs +++ b/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs @@ -1,4 +1,4 @@ -using Studio.Asset; +using Studio.AssetTool; namespace Studio.Command { diff --git a/Assets/Scripts/Studio/Command/FileCommand/LoadLocalModelDataCommand.cs b/Assets/Scripts/Studio/Command/FileCommand/LoadLocalModelDataCommand.cs index ab1d356f..f629b78d 100644 --- a/Assets/Scripts/Studio/Command/FileCommand/LoadLocalModelDataCommand.cs +++ b/Assets/Scripts/Studio/Command/FileCommand/LoadLocalModelDataCommand.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Linq; using UnityEngine; -using Studio.Asset; +using Studio.AssetTool; using Studio.Manage; using Studio.Repositories; using Studio.Util; diff --git a/Assets/Scripts/Studio/Command/FileCommand/LoadLocalTextureDataCommand.cs b/Assets/Scripts/Studio/Command/FileCommand/LoadLocalTextureDataCommand.cs index 77096257..2aaee709 100644 --- a/Assets/Scripts/Studio/Command/FileCommand/LoadLocalTextureDataCommand.cs +++ b/Assets/Scripts/Studio/Command/FileCommand/LoadLocalTextureDataCommand.cs @@ -1,6 +1,7 @@ using System.Collections; using UnityEngine; using Studio.Manage; +using Studio.AssetTool; namespace Studio.Command { diff --git a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateMoveGizmoCommand.cs b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateMoveGizmoCommand.cs index 1f258060..2f8733ea 100644 --- a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateMoveGizmoCommand.cs +++ b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateMoveGizmoCommand.cs @@ -1,3 +1,4 @@ +using Studio.AssetTool; using Studio.Manage; using Studio.RuntimeGizmo; using Studio.Util; diff --git a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateRotateGizmoCommand.cs b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateRotateGizmoCommand.cs index a0ca7357..31983926 100644 --- a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateRotateGizmoCommand.cs +++ b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateRotateGizmoCommand.cs @@ -1,3 +1,4 @@ +using Studio.AssetTool; using Studio.Manage; using Studio.RuntimeGizmo; using Studio.Util; diff --git a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateScaleGizmoCommand.cs b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateScaleGizmoCommand.cs index b3b4b904..b49fb0d5 100644 --- a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateScaleGizmoCommand.cs +++ b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateScaleGizmoCommand.cs @@ -1,3 +1,4 @@ +using Studio.AssetTool; using Studio.Manage; using Studio.RuntimeGizmo; using Studio.Util; diff --git a/Assets/Scripts/Studio/Command/GizmoCommand/ResetGizmoCommand.cs b/Assets/Scripts/Studio/Command/GizmoCommand/ResetGizmoCommand.cs index e44ba1ea..c26fdee7 100644 --- a/Assets/Scripts/Studio/Command/GizmoCommand/ResetGizmoCommand.cs +++ b/Assets/Scripts/Studio/Command/GizmoCommand/ResetGizmoCommand.cs @@ -1,3 +1,4 @@ +using Studio.AssetTool; using Studio.Manage; using Studio.RuntimeGizmo; using Studio.Util; diff --git a/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs b/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs index b676c3ad..25cf4b97 100644 --- a/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using UnityEngine; -using Studio.Asset; +using Studio.AssetTool; using Studio.HierarchyTree; using Studio.Manage; using Studio.Util; diff --git a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs index 3b2d0dfc..b21ba0ff 100644 --- a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using Studio.Asset; +using Studio.AssetTool; using Studio.Command; using Studio.HierarchyTree; using Studio.Manage; diff --git a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs index 79c25cfa..66efd3af 100644 --- a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Studio.Asset; +using Studio.AssetTool; using Studio.HierarchyTree; using Studio.Manage; using Studio.Util; diff --git a/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs b/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs index 0365fb8a..21f4e682 100644 --- a/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using TriLibCore.SFB; -using Studio.Asset; +using Studio.AssetTool; using Studio.HierarchyTree; using Studio.Manage; using Studio.Util; diff --git a/Assets/Scripts/Studio/Command/ProjectCommand/NewProjectCommand.cs b/Assets/Scripts/Studio/Command/ProjectCommand/NewProjectCommand.cs index 2f187544..77545a91 100644 --- a/Assets/Scripts/Studio/Command/ProjectCommand/NewProjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ProjectCommand/NewProjectCommand.cs @@ -1,4 +1,4 @@ -using Studio.Asset; +using Studio.AssetTool; using Studio.Manage; namespace Studio.Command diff --git a/Assets/Scripts/Studio/Command/ProjectCommand/SaveProjectCommand.cs b/Assets/Scripts/Studio/Command/ProjectCommand/SaveProjectCommand.cs index e812f588..2b28a7ab 100644 --- a/Assets/Scripts/Studio/Command/ProjectCommand/SaveProjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ProjectCommand/SaveProjectCommand.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.IO; using TriLibCore.SFB; -using Studio.Asset; +using Studio.AssetTool; using Studio.Command; using Studio.Manage; using Studio.Service; diff --git a/Assets/Scripts/Studio/Core/SystemMain.cs b/Assets/Scripts/Studio/Core/SystemMain.cs index 6fc56eb2..e1c07020 100644 --- a/Assets/Scripts/Studio/Core/SystemMain.cs +++ b/Assets/Scripts/Studio/Core/SystemMain.cs @@ -1,4 +1,4 @@ -using Studio.Asset; +using Studio.AssetTool; using Studio.Command; using Studio.Manage; diff --git a/Assets/Scripts/Studio/DataStructures/ThumbnailData.cs b/Assets/Scripts/Studio/DataStructures/ThumbnailData.cs index bb39d5ab..97593550 100644 --- a/Assets/Scripts/Studio/DataStructures/ThumbnailData.cs +++ b/Assets/Scripts/Studio/DataStructures/ThumbnailData.cs @@ -1,6 +1,6 @@ using MessagePack; -namespace Studio.Manage +namespace Studio.AssetTool { [MessagePackObject] public class ThumbnailData diff --git a/Assets/Scripts/Studio/Managers/ManagerHub.cs b/Assets/Scripts/Studio/Managers/ManagerHub.cs index 00332c95..700d9302 100644 --- a/Assets/Scripts/Studio/Managers/ManagerHub.cs +++ b/Assets/Scripts/Studio/Managers/ManagerHub.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using UnityEngine; -using Studio.Asset; +using Studio.AssetTool; using Studio.Core; using Studio.Util; diff --git a/Assets/Scripts/Studio/Managers/ProjectManager.cs b/Assets/Scripts/Studio/Managers/ProjectManager.cs index cdecc2b9..bfdac743 100644 --- a/Assets/Scripts/Studio/Managers/ProjectManager.cs +++ b/Assets/Scripts/Studio/Managers/ProjectManager.cs @@ -6,7 +6,7 @@ using System.Linq; using TriLibCore.Dae.Schema; using TriLibCore.SFB; using UnityEditor; -using Studio.Asset; +using Studio.AssetTool; using Studio.Command; using Studio.HierarchyTree; using Studio.Service; diff --git a/Assets/Scripts/Studio/Service/AssetDataService.cs b/Assets/Scripts/Studio/Service/AssetDataService.cs index e012739c..69293bd2 100644 --- a/Assets/Scripts/Studio/Service/AssetDataService.cs +++ b/Assets/Scripts/Studio/Service/AssetDataService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Studio.Util; -using Studio.Asset; +using Studio.AssetTool; using System.Linq; using Studio.HierarchyTree; diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs index 1bccf74c..5623312f 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs @@ -1,5 +1,5 @@ using UnityEngine; -using Studio.Asset; +using Studio.AssetTool; using Studio.Manage; using Studio.UI; using XRLib.UI; diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index fef8b818..cf8a7b86 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -7,6 +7,7 @@ using XRLib; using XRLib.UI; using XED; using XED.UI; +using Studio.AssetTool; namespace Studio { diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs index 912ce102..6d623231 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs @@ -4,6 +4,7 @@ using UnityEngine; using Studio.Manage; using Studio.Util; using Studio.Command; +using Studio.AssetTool; namespace Studio.UI { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectAlign.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectAlign.cs index ed5b43a7..c885bccd 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectAlign.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectAlign.cs @@ -1,7 +1,7 @@ using TMPro; using UnityEngine; using UnityEngine.UI; -using Studio.Asset; +using Studio.AssetTool; using Studio.Manage; using Studio.Util; using XRLib.UI; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs index 32f53c5f..795261dd 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs @@ -5,6 +5,7 @@ using UnityEngine; using Studio.Util; using XRLib; using XRLib.UI; +using Studio.AssetTool; namespace Studio.UI { diff --git a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollItemUI.cs b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollItemUI.cs index 922a7249..6d28883a 100644 --- a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollItemUI.cs +++ b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollItemUI.cs @@ -7,6 +7,7 @@ using UnityEngine.EventSystems; using UnityEngine.Events; using Studio.Manage; using Studio.Util; +using Studio.AssetTool; namespace Studio.AssetLibraryTree { diff --git a/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs b/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs index 7a164bf5..05835c1e 100644 --- a/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs +++ b/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; using XRLib.UI; -using Studio.Asset; +using Studio.AssetTool; using Studio.HierarchyTree; using Studio.Manage; diff --git a/Assets/Test/AGVNode/AGVNodeManager.cs b/Assets/Test/AGVNode/AGVNodeManager.cs index 3ce1daaf..519cc590 100644 --- a/Assets/Test/AGVNode/AGVNodeManager.cs +++ b/Assets/Test/AGVNode/AGVNodeManager.cs @@ -7,7 +7,7 @@ using UnityEngine; using XRLib; using Studio.Interfaces; using Studio.Test; -using Studio.Asset; +using Studio.AssetTool; using Object = UnityEngine.Object; using static Studio.Enums;