From 45cb2a04fe1eb657ba983deb86779c0530e883e5 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 20 Jul 2024 23:00:12 +0900 Subject: [PATCH] mv MaterialIO from VRMShaders to UniGLTF --- Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export.meta | 3 +++ .../IO/MaterialIO/{ => Export}/GltfMaterialExportUtils.cs | 0 .../MaterialIO/{ => Export}/GltfMaterialExportUtils.cs.meta | 0 .../UniGLTF/IO/MaterialIO/{ => Export}/IMaterialExporter.cs | 0 .../IO/MaterialIO/{ => Export}/IMaterialExporter.cs.meta | 4 ++-- Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import.meta | 3 +++ .../IO/MaterialIO/{ => Import}/GltfMaterialImportUtils.cs | 0 .../MaterialIO/{ => Import}/GltfMaterialImportUtils.cs.meta | 0 .../MaterialIO/{ => Import}/IMaterialDescriptorGenerator.cs | 0 .../{ => Import}/IMaterialDescriptorGenerator.cs.meta | 4 ++-- .../UniGLTF/IO/MaterialIO/Import}/MaterialDescriptor.cs | 0 .../UniGLTF/IO/MaterialIO/Import}/MaterialDescriptor.cs.meta | 0 .../Runtime/UniGLTF/IO/MaterialIO/Import}/MaterialFactory.cs | 0 .../UniGLTF/IO/MaterialIO/Import}/MaterialFactory.cs.meta | 0 .../{ => Import}/MaterialImporterParamExtensions.cs | 0 .../{ => Import}/MaterialImporterParamExtensions.cs.meta | 0 .../GLTF/IO/Runtime/AwaitCaller/IAwaitCaller.cs.meta | 2 +- .../GLTF/IO/Runtime/AwaitCaller/ImmediateCaller.cs.meta | 2 +- .../IO/Runtime/AwaitCaller/NextFrameTaskScheduler.cs.meta | 2 +- .../IO/Runtime/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta | 2 +- .../AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta | 2 +- .../IO/Runtime/AwaitCaller/TinyManagedTaskScheduler.cs.meta | 2 +- Assets/VRMShaders/GLTF/IO/Runtime/Material.meta | 3 --- Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer.meta | 3 --- 24 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export.meta rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{ => Export}/GltfMaterialExportUtils.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{ => Export}/GltfMaterialExportUtils.cs.meta (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{ => Export}/IMaterialExporter.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{ => Export}/IMaterialExporter.cs.meta (71%) create mode 100644 Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import.meta rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{ => Import}/GltfMaterialImportUtils.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{ => Import}/GltfMaterialImportUtils.cs.meta (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{ => Import}/IMaterialDescriptorGenerator.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{ => Import}/IMaterialDescriptorGenerator.cs.meta (71%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Material/Importer => UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import}/MaterialDescriptor.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Material/Importer => UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import}/MaterialDescriptor.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Material/Importer => UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import}/MaterialFactory.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Material/Importer => UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import}/MaterialFactory.cs.meta (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{ => Import}/MaterialImporterParamExtensions.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{ => Import}/MaterialImporterParamExtensions.cs.meta (100%) delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/Material.meta delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export.meta new file mode 100644 index 000000000..f13e48632 --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c361a1fc6032467aa77f6ecc470d4503 +timeCreated: 1721483918 \ No newline at end of file diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialExportUtils.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/GltfMaterialExportUtils.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialExportUtils.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/GltfMaterialExportUtils.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialExportUtils.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/GltfMaterialExportUtils.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialExportUtils.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/GltfMaterialExportUtils.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/IMaterialExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/IMaterialExporter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/IMaterialExporter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs.meta similarity index 71% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/IMaterialExporter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs.meta index c8cff3c4c..7793af576 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/IMaterialExporter.cs.meta +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 -guid: afbe933c51a9404199ba1efe6d2f8c62 +fileFormatVersion: 2 +guid: afbe933c51a9404199ba1efe6d2f8c62 timeCreated: 1622015749 \ No newline at end of file diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import.meta new file mode 100644 index 000000000..206bd6692 --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d488314aa2e44b84b3ff5348cf2f3b08 +timeCreated: 1721483827 \ No newline at end of file diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImportUtils.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/GltfMaterialImportUtils.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImportUtils.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/GltfMaterialImportUtils.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImportUtils.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/GltfMaterialImportUtils.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImportUtils.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/GltfMaterialImportUtils.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/IMaterialDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/IMaterialDescriptorGenerator.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/IMaterialDescriptorGenerator.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs.meta similarity index 71% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/IMaterialDescriptorGenerator.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs.meta index 386a8bc44..73ead0f3d 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/IMaterialDescriptorGenerator.cs.meta +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 -guid: c309fb8ee8534a54b291d408511c9331 +fileFormatVersion: 2 +guid: c309fb8ee8534a54b291d408511c9331 timeCreated: 1622015740 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialDescriptor.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptor.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialDescriptor.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptor.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialDescriptor.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptor.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialDescriptor.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptor.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialFactory.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialFactory.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialFactory.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialFactory.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialFactory.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialFactory.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialFactory.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialFactory.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialImporterParamExtensions.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialImporterParamExtensions.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialImporterParamExtensions.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialImporterParamExtensions.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialImporterParamExtensions.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialImporterParamExtensions.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialImporterParamExtensions.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialImporterParamExtensions.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/IAwaitCaller.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/IAwaitCaller.cs.meta index 91b41274c..2433eaeaa 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/IAwaitCaller.cs.meta +++ b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/IAwaitCaller.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9cd79193a3dfa7148bb76882f4988071 +guid: b381854307ab2814fbed3675a370b2e2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/ImmediateCaller.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/ImmediateCaller.cs.meta index a128df3a9..87d5cdb6b 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/ImmediateCaller.cs.meta +++ b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/ImmediateCaller.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 30f43d5b7d6b4184fb775a315b835365 +guid: 7ef2aac87a2c64f4da10574f463ce6e5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/NextFrameTaskScheduler.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/NextFrameTaskScheduler.cs.meta index 02892074e..d0acf7824 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/NextFrameTaskScheduler.cs.meta +++ b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/NextFrameTaskScheduler.cs.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 3ce7defdc7144878a058274ae561d0be +guid: 8782dbc36975e6848870c8a238b85c65 timeCreated: 1634203513 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta index a9e2c5963..bad84eed4 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta +++ b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: e4e64b1835ca4cd2b682a6bda572b8fb +guid: ce49957c7e15bea4ba3025c536fcbff7 timeCreated: 1634203216 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta index 42bdc91ae..e165c4318 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta +++ b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6d3630f9fecf62f4a8137907b0f7beb2 +guid: c03c79777091593448c34eb4dfd35300 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/TinyManagedTaskScheduler.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/TinyManagedTaskScheduler.cs.meta index 3c81f82e0..6487ad8e0 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/TinyManagedTaskScheduler.cs.meta +++ b/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/TinyManagedTaskScheduler.cs.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 9c52ff07a0834bdc8f4c8d6c7f9a634f +guid: 200218a9545e455468caf9c92e92b114 timeCreated: 1634203919 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Material.meta b/Assets/VRMShaders/GLTF/IO/Runtime/Material.meta deleted file mode 100644 index cc2279961..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Material.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: fa4e999255844cbe8606a9e2a777aae9 -timeCreated: 1634201374 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer.meta b/Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer.meta deleted file mode 100644 index 82d23457d..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: ca0732c6f65b4a9f8c929a6f875b7bec -timeCreated: 1634201379 \ No newline at end of file