From 246e926b95b712fe6910c97db49d181e619d26d3 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 20 Jul 2024 22:55:53 +0900 Subject: [PATCH 1/9] mv AnimationIO from VRMShaders to UniGLTF --- Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Export.meta | 3 +++ .../UniGLTF/IO/AnimationIO/{ => Export}/IAnimationExporter.cs | 0 .../IO/AnimationIO/{ => Export}/IAnimationExporter.cs.meta | 0 Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import.meta | 3 +++ .../UniGLTF/IO/AnimationIO/Import}/AnimationClipFactory.cs | 0 .../IO/AnimationIO/Import}/AnimationClipFactory.cs.meta | 0 .../IO/AnimationIO/{ => Import}/AnimationImporterUtil.cs | 0 .../IO/AnimationIO/{ => Import}/AnimationImporterUtil.cs.meta | 0 Assets/VRMShaders/GLTF/IO/Runtime/Animation.meta | 3 --- Assets/VRMShaders/GLTF/IO/Runtime/Animation/Importer.meta | 3 --- 10 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Export.meta rename Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/{ => Export}/IAnimationExporter.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/{ => Export}/IAnimationExporter.cs.meta (100%) create mode 100644 Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import.meta rename Assets/{VRMShaders/GLTF/IO/Runtime/Animation/Importer => UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import}/AnimationClipFactory.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Animation/Importer => UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import}/AnimationClipFactory.cs.meta (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/{ => Import}/AnimationImporterUtil.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/{ => Import}/AnimationImporterUtil.cs.meta (100%) delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/Animation.meta delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/Animation/Importer.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Export.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Export.meta new file mode 100644 index 000000000..76cf5fdd2 --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Export.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 44c184c5fb704e08b064c515409d4d9e +timeCreated: 1721483589 \ No newline at end of file diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/IAnimationExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Export/IAnimationExporter.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/IAnimationExporter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Export/IAnimationExporter.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/IAnimationExporter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Export/IAnimationExporter.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/IAnimationExporter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Export/IAnimationExporter.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import.meta new file mode 100644 index 000000000..b0589cca3 --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3d3b03f6cf8e4923a3f7e5f90db85b57 +timeCreated: 1721483585 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Animation/Importer/AnimationClipFactory.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationClipFactory.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Animation/Importer/AnimationClipFactory.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationClipFactory.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Animation/Importer/AnimationClipFactory.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationClipFactory.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Animation/Importer/AnimationClipFactory.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationClipFactory.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/AnimationImporterUtil.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationImporterUtil.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/AnimationImporterUtil.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationImporterUtil.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/AnimationImporterUtil.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationImporterUtil.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/AnimationImporterUtil.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationImporterUtil.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Animation.meta b/Assets/VRMShaders/GLTF/IO/Runtime/Animation.meta deleted file mode 100644 index 91c14e135..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Animation.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 17a34dd6c85b45e3a15315e62a02263b -timeCreated: 1634201983 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Animation/Importer.meta b/Assets/VRMShaders/GLTF/IO/Runtime/Animation/Importer.meta deleted file mode 100644 index e99caa5f7..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Animation/Importer.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: ac44561b395c401787a20f8c28087f4c -timeCreated: 1634201992 \ No newline at end of file From 45cb2a04fe1eb657ba983deb86779c0530e883e5 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 20 Jul 2024 23:00:12 +0900 Subject: [PATCH 2/9] 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 From 5cdec669a0224546944a4470c3c5e5756c5b6545 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 20 Jul 2024 23:08:55 +0900 Subject: [PATCH 3/9] mv TextureIO from VRMShaders to UniGLTF --- Assets/UniGLTF/Editor/UniGLTF/IO.meta | 3 +++ .../Editor/UniGLTF/IO}/Texture.meta | 0 .../IO}/Texture/EditorTextureUtility.cs | 0 .../IO}/Texture/EditorTextureUtility.cs.meta | 0 .../Editor/UniGLTF/IO}/Texture/Exporter.meta | 0 .../Exporter/EditorTextureSerializer.cs | 0 .../Exporter/EditorTextureSerializer.cs.meta | 0 .../Editor/UniGLTF/IO}/Texture/Importer.meta | 0 .../Importer/TextureImporterConfigurator.cs | 0 .../TextureImporterConfigurator.cs.meta | 0 .../GLTF/IO => UniGLTF}/Resources.meta | 0 .../IO => UniGLTF}/Resources/UniGLTF.meta | 0 .../UniGLTF/NormalMapExporter.shader | 0 .../UniGLTF/NormalMapExporter.shader.meta | 0 .../UniGLTF/StandardMapExporter.shader | 0 .../UniGLTF/StandardMapExporter.shader.meta | 0 .../UniGLTF/StandardMapImporter.shader | 0 .../UniGLTF/StandardMapImporter.shader.meta | 0 .../UniGLTF/IO/TextureIO}/Converter.meta | 0 .../TextureIO}/Converter/NormalConverter.cs | 0 .../Converter/NormalConverter.cs.meta | 0 .../OcclusionMetallicRoughnessConverter.cs | 0 ...cclusionMetallicRoughnessConverter.cs.meta | 0 .../TextureIO}/Converter/TextureConverter.cs | 0 .../Converter/TextureConverter.cs.meta | 0 .../Runtime/UniGLTF/IO/TextureIO/Export.meta | 3 +++ .../{ => Export}/GltfTextureExporter.cs | 0 .../{ => Export}/GltfTextureExporter.cs.meta | 0 .../IO/TextureIO/Export}/ITextureExporter.cs | 0 .../Export}/ITextureExporter.cs.meta | 0 .../TextureIO/Export}/ITextureSerializer.cs | 0 .../Export}/ITextureSerializer.cs.meta | 0 .../Export}/RuntimeTextureSerializer.cs | 0 .../Export}/RuntimeTextureSerializer.cs.meta | 0 .../TextureIO/Export}/TextureExportParam.cs | 0 .../Export}/TextureExportParam.cs.meta | 0 .../TextureIO/Export}/TextureExportTypes.cs | 0 .../Export}/TextureExportTypes.cs.meta | 0 .../IO/TextureIO/Export}/TextureExporter.cs | 0 .../TextureIO/Export}/TextureExporter.cs.meta | 0 .../Runtime/UniGLTF/IO/TextureIO/Import.meta | 3 +++ .../Import}/DeserializingTextureInfo.cs | 0 .../Import}/DeserializingTextureInfo.cs.meta | 0 .../{ => Import}/GltfPbrTextureImporter.cs | 0 .../GltfPbrTextureImporter.cs.meta | 4 +-- .../GltfTextureDescriptorGenerator.cs | 0 .../GltfTextureDescriptorGenerator.cs.meta | 0 .../{ => Import}/GltfTextureImporter.cs | 0 .../{ => Import}/GltfTextureImporter.cs.meta | 0 .../ITextureDescriptorGenerator.cs | 0 .../ITextureDescriptorGenerator.cs.meta | 4 +-- .../TextureIO/Import}/ITextureDeserializer.cs | 0 .../Import}/ITextureDeserializer.cs.meta | 0 .../Import}/KtxTextureDeserializer.cs | 0 .../Import}/KtxTextureDeserializer.cs.meta | 0 .../IO/TextureIO/Import}/SamplerParam.cs | 0 .../IO/TextureIO/Import}/SamplerParam.cs.meta | 0 .../IO/TextureIO/Import}/TextureDescriptor.cs | 0 .../Import}/TextureDescriptor.cs.meta | 0 .../TextureIO/Import}/TextureDescriptorSet.cs | 0 .../Import}/TextureDescriptorSet.cs.meta | 0 .../IO/TextureIO/Import}/TextureFactory.cs | 0 .../TextureIO/Import}/TextureFactory.cs.meta | 0 .../IO/TextureIO/Import}/TextureImportName.cs | 0 .../Import}/TextureImportName.cs.meta | 0 .../TextureIO/Import}/TextureImportTypes.cs | 0 .../Import}/TextureImportTypes.cs.meta | 0 .../UnitySupportedImageTypeDeserializer.cs | 0 ...nitySupportedImageTypeDeserializer.cs.meta | 0 .../Import}/UnityTextureDeserializer.cs | 0 .../Import}/UnityTextureDeserializer.cs.meta | 0 .../IO/TextureIO}/TextureExtensions.cs | 0 .../IO/TextureIO}/TextureExtensions.cs.meta | 0 .../Tests/UniGLTF}/4x4_non_readable.png | Bin .../Tests/UniGLTF}/4x4_non_readable.png.meta | 0 .../UniGLTF}/4x4_non_readable_compressed.DDS | Bin .../4x4_non_readable_compressed.DDS.meta | 0 .../Tests/UniGLTF}/CopyTextureTests.cs | 0 .../Tests/UniGLTF}/CopyTextureTests.cs.meta | 4 +-- .../MetallicRoughnessConverterTests.cs | 0 .../MetallicRoughnessConverterTests.cs.meta | 0 .../Tests/UniGLTF}/PathObjectTests.cs | 0 .../Tests/UniGLTF}/PathObjectTests.cs.meta | 0 .../Tests/UniGLTF}/TextureBytesTests.cs | 0 .../Tests/UniGLTF}/TextureBytesTests.cs.meta | 0 .../VRM.Samples.Editor.Tests.asmdef | 4 ++- Assets/VRM/Tests/VRM.Tests.asmdef | 3 ++- Assets/VRM10/Tests/VRM10.Tests.asmdef | 4 ++- Assets/VRMShaders/GLTF/IO/Editor.meta | 8 ------ .../Editor/VRMShaders.GLTF.IO.Editor.asmdef | 17 ------------- .../VRMShaders.GLTF.IO.Editor.asmdef.meta | 7 ----- .../VRMShaders/GLTF/IO/Runtime/Texture.meta | 3 --- .../GLTF/IO/Runtime/Texture/Exporter.meta | 3 --- .../GLTF/IO/Runtime/Texture/Importer.meta | 3 --- .../GLTF/IO/Runtime/Texture/Util.meta | 3 --- Assets/VRMShaders/GLTF/IO/Tests.meta | 8 ------ .../IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef | 24 ------------------ .../VRMShaders.GLTF.IO.Tests.asmdef.meta | 7 ----- 98 files changed, 23 insertions(+), 92 deletions(-) create mode 100644 Assets/UniGLTF/Editor/UniGLTF/IO.meta rename Assets/{VRMShaders/GLTF/IO/Editor => UniGLTF/Editor/UniGLTF/IO}/Texture.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Editor => UniGLTF/Editor/UniGLTF/IO}/Texture/EditorTextureUtility.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Editor => UniGLTF/Editor/UniGLTF/IO}/Texture/EditorTextureUtility.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Editor => UniGLTF/Editor/UniGLTF/IO}/Texture/Exporter.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Editor => UniGLTF/Editor/UniGLTF/IO}/Texture/Exporter/EditorTextureSerializer.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Editor => UniGLTF/Editor/UniGLTF/IO}/Texture/Exporter/EditorTextureSerializer.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Editor => UniGLTF/Editor/UniGLTF/IO}/Texture/Importer.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Editor => UniGLTF/Editor/UniGLTF/IO}/Texture/Importer/TextureImporterConfigurator.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Editor => UniGLTF/Editor/UniGLTF/IO}/Texture/Importer/TextureImporterConfigurator.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO => UniGLTF}/Resources.meta (100%) rename Assets/{VRMShaders/GLTF/IO => UniGLTF}/Resources/UniGLTF.meta (100%) rename Assets/{VRMShaders/GLTF/IO => UniGLTF}/Resources/UniGLTF/NormalMapExporter.shader (100%) rename Assets/{VRMShaders/GLTF/IO => UniGLTF}/Resources/UniGLTF/NormalMapExporter.shader.meta (100%) rename Assets/{VRMShaders/GLTF/IO => UniGLTF}/Resources/UniGLTF/StandardMapExporter.shader (100%) rename Assets/{VRMShaders/GLTF/IO => UniGLTF}/Resources/UniGLTF/StandardMapExporter.shader.meta (100%) rename Assets/{VRMShaders/GLTF/IO => UniGLTF}/Resources/UniGLTF/StandardMapImporter.shader (100%) rename Assets/{VRMShaders/GLTF/IO => UniGLTF}/Resources/UniGLTF/StandardMapImporter.shader.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture => UniGLTF/Runtime/UniGLTF/IO/TextureIO}/Converter.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture => UniGLTF/Runtime/UniGLTF/IO/TextureIO}/Converter/NormalConverter.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture => UniGLTF/Runtime/UniGLTF/IO/TextureIO}/Converter/NormalConverter.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture => UniGLTF/Runtime/UniGLTF/IO/TextureIO}/Converter/OcclusionMetallicRoughnessConverter.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture => UniGLTF/Runtime/UniGLTF/IO/TextureIO}/Converter/OcclusionMetallicRoughnessConverter.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture => UniGLTF/Runtime/UniGLTF/IO/TextureIO}/Converter/TextureConverter.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture => UniGLTF/Runtime/UniGLTF/IO/TextureIO}/Converter/TextureConverter.cs.meta (100%) create mode 100644 Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export.meta rename Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/{ => Export}/GltfTextureExporter.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/{ => Export}/GltfTextureExporter.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/ITextureExporter.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/ITextureExporter.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/ITextureSerializer.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/ITextureSerializer.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/RuntimeTextureSerializer.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/RuntimeTextureSerializer.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/TextureExportParam.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/TextureExportParam.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/TextureExportTypes.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/TextureExportTypes.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/TextureExporter.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Exporter => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export}/TextureExporter.cs.meta (100%) create mode 100644 Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import.meta rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/DeserializingTextureInfo.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/DeserializingTextureInfo.cs.meta (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/{ => Import}/GltfPbrTextureImporter.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/{ => Import}/GltfPbrTextureImporter.cs.meta (71%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/{ => Import}/GltfTextureDescriptorGenerator.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/{ => Import}/GltfTextureDescriptorGenerator.cs.meta (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/{ => Import}/GltfTextureImporter.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/{ => Import}/GltfTextureImporter.cs.meta (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/{ => Import}/ITextureDescriptorGenerator.cs (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/{ => Import}/ITextureDescriptorGenerator.cs.meta (71%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/ITextureDeserializer.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/ITextureDeserializer.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/KtxTextureDeserializer.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/KtxTextureDeserializer.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/SamplerParam.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/SamplerParam.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/TextureDescriptor.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/TextureDescriptor.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/TextureDescriptorSet.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/TextureDescriptorSet.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/TextureFactory.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/TextureFactory.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/TextureImportName.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/TextureImportName.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/TextureImportTypes.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/TextureImportTypes.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/UnitySupportedImageTypeDeserializer.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/UnitySupportedImageTypeDeserializer.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/UnityTextureDeserializer.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Importer => UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import}/UnityTextureDeserializer.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Util => UniGLTF/Runtime/UniGLTF/IO/TextureIO}/TextureExtensions.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Texture/Util => UniGLTF/Runtime/UniGLTF/IO/TextureIO}/TextureExtensions.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/4x4_non_readable.png (100%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/4x4_non_readable.png.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/4x4_non_readable_compressed.DDS (100%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/4x4_non_readable_compressed.DDS.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/CopyTextureTests.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/CopyTextureTests.cs.meta (71%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/MetallicRoughnessConverterTests.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/MetallicRoughnessConverterTests.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/PathObjectTests.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/PathObjectTests.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/TextureBytesTests.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Tests => UniGLTF/Tests/UniGLTF}/TextureBytesTests.cs.meta (100%) delete mode 100644 Assets/VRMShaders/GLTF/IO/Editor.meta delete mode 100644 Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef delete mode 100644 Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef.meta delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/Texture.meta delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter.meta delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer.meta delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/Texture/Util.meta delete mode 100644 Assets/VRMShaders/GLTF/IO/Tests.meta delete mode 100644 Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef delete mode 100644 Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef.meta diff --git a/Assets/UniGLTF/Editor/UniGLTF/IO.meta b/Assets/UniGLTF/Editor/UniGLTF/IO.meta new file mode 100644 index 000000000..651f9aa16 --- /dev/null +++ b/Assets/UniGLTF/Editor/UniGLTF/IO.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8e700c0746b947c28cb2436d9111fcaa +timeCreated: 1721484195 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture.meta b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Editor/Texture.meta rename to Assets/UniGLTF/Editor/UniGLTF/IO/Texture.meta diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/EditorTextureUtility.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs rename to Assets/UniGLTF/Editor/UniGLTF/IO/Texture/EditorTextureUtility.cs diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/EditorTextureUtility.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/IO/Texture/EditorTextureUtility.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter.meta b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter.meta rename to Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter.meta diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter/EditorTextureSerializer.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs rename to Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter/EditorTextureSerializer.cs diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter/EditorTextureSerializer.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter/EditorTextureSerializer.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer.meta b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer.meta rename to Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer.meta diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer/TextureImporterConfigurator.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs rename to Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer/TextureImporterConfigurator.cs diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer/TextureImporterConfigurator.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer/TextureImporterConfigurator.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Resources.meta b/Assets/UniGLTF/Resources.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Resources.meta rename to Assets/UniGLTF/Resources.meta diff --git a/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF.meta b/Assets/UniGLTF/Resources/UniGLTF.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Resources/UniGLTF.meta rename to Assets/UniGLTF/Resources/UniGLTF.meta diff --git a/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/NormalMapExporter.shader b/Assets/UniGLTF/Resources/UniGLTF/NormalMapExporter.shader similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/NormalMapExporter.shader rename to Assets/UniGLTF/Resources/UniGLTF/NormalMapExporter.shader diff --git a/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/NormalMapExporter.shader.meta b/Assets/UniGLTF/Resources/UniGLTF/NormalMapExporter.shader.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/NormalMapExporter.shader.meta rename to Assets/UniGLTF/Resources/UniGLTF/NormalMapExporter.shader.meta diff --git a/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapExporter.shader b/Assets/UniGLTF/Resources/UniGLTF/StandardMapExporter.shader similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapExporter.shader rename to Assets/UniGLTF/Resources/UniGLTF/StandardMapExporter.shader diff --git a/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapExporter.shader.meta b/Assets/UniGLTF/Resources/UniGLTF/StandardMapExporter.shader.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapExporter.shader.meta rename to Assets/UniGLTF/Resources/UniGLTF/StandardMapExporter.shader.meta diff --git a/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapImporter.shader b/Assets/UniGLTF/Resources/UniGLTF/StandardMapImporter.shader similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapImporter.shader rename to Assets/UniGLTF/Resources/UniGLTF/StandardMapImporter.shader diff --git a/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapImporter.shader.meta b/Assets/UniGLTF/Resources/UniGLTF/StandardMapImporter.shader.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapImporter.shader.meta rename to Assets/UniGLTF/Resources/UniGLTF/StandardMapImporter.shader.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/NormalConverter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/NormalConverter.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/NormalConverter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/NormalConverter.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/NormalConverter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/NormalConverter.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/NormalConverter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/NormalConverter.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/OcclusionMetallicRoughnessConverter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/OcclusionMetallicRoughnessConverter.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/OcclusionMetallicRoughnessConverter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/OcclusionMetallicRoughnessConverter.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/OcclusionMetallicRoughnessConverter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/OcclusionMetallicRoughnessConverter.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/OcclusionMetallicRoughnessConverter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/OcclusionMetallicRoughnessConverter.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/TextureConverter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/TextureConverter.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/TextureConverter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/TextureConverter.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/TextureConverter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/TextureConverter.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Converter/TextureConverter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/TextureConverter.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export.meta new file mode 100644 index 000000000..f0ec09a8c --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 428f4eff6b0d43cb82c9efa4eb9a30a2 +timeCreated: 1721484031 \ No newline at end of file diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/GltfTextureExporter.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/GltfTextureExporter.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/GltfTextureExporter.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/GltfTextureExporter.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureExporter.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureExporter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureExporter.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureExporter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureExporter.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureExporter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureExporter.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureSerializer.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureSerializer.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureSerializer.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureSerializer.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/RuntimeTextureSerializer.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/RuntimeTextureSerializer.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/RuntimeTextureSerializer.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/RuntimeTextureSerializer.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExportParam.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportParam.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExportParam.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportParam.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExportParam.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportParam.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExportParam.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportParam.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExportTypes.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportTypes.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExportTypes.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportTypes.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExportTypes.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportTypes.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExportTypes.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportTypes.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExporter.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExporter.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExporter.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExporter.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import.meta new file mode 100644 index 000000000..fc54022ee --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 567579664b9249bfb639752e8c01a0bc +timeCreated: 1721484026 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/DeserializingTextureInfo.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/DeserializingTextureInfo.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/DeserializingTextureInfo.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/DeserializingTextureInfo.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/DeserializingTextureInfo.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/DeserializingTextureInfo.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/DeserializingTextureInfo.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/DeserializingTextureInfo.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfPbrTextureImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfPbrTextureImporter.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfPbrTextureImporter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfPbrTextureImporter.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfPbrTextureImporter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfPbrTextureImporter.cs.meta similarity index 71% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfPbrTextureImporter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfPbrTextureImporter.cs.meta index 6fecbedc0..8c8eff1ce 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfPbrTextureImporter.cs.meta +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfPbrTextureImporter.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 -guid: 9a1c5210d71f47ab80a1549b77c9a8a3 +fileFormatVersion: 2 +guid: 9a1c5210d71f47ab80a1549b77c9a8a3 timeCreated: 1622027042 \ No newline at end of file diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureDescriptorGenerator.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureDescriptorGenerator.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureDescriptorGenerator.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureDescriptorGenerator.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureDescriptorGenerator.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureDescriptorGenerator.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureDescriptorGenerator.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureImporter.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureImporter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureImporter.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureImporter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureImporter.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureImporter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureImporter.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDescriptorGenerator.cs similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureDescriptorGenerator.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDescriptorGenerator.cs diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureDescriptorGenerator.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDescriptorGenerator.cs.meta similarity index 71% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureDescriptorGenerator.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDescriptorGenerator.cs.meta index 674d3aab5..4e40632a3 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureDescriptorGenerator.cs.meta +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDescriptorGenerator.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 -guid: 8e671772001d477b82c414ce708b7e7f +fileFormatVersion: 2 +guid: 8e671772001d477b82c414ce708b7e7f timeCreated: 1622018845 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/ITextureDeserializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDeserializer.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/ITextureDeserializer.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDeserializer.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/ITextureDeserializer.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDeserializer.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/ITextureDeserializer.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDeserializer.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/KtxTextureDeserializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/KtxTextureDeserializer.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/KtxTextureDeserializer.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/KtxTextureDeserializer.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/KtxTextureDeserializer.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/KtxTextureDeserializer.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/KtxTextureDeserializer.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/KtxTextureDeserializer.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/SamplerParam.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/SamplerParam.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/SamplerParam.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/SamplerParam.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/SamplerParam.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/SamplerParam.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/SamplerParam.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/SamplerParam.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureDescriptor.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptor.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureDescriptor.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptor.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureDescriptor.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptor.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureDescriptor.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptor.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureDescriptorSet.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptorSet.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureDescriptorSet.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptorSet.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureDescriptorSet.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptorSet.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureDescriptorSet.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptorSet.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureFactory.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureFactory.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureFactory.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureFactory.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureFactory.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureFactory.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureFactory.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureFactory.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureImportName.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportName.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureImportName.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportName.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureImportName.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportName.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureImportName.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportName.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureImportTypes.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportTypes.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureImportTypes.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportTypes.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureImportTypes.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportTypes.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureImportTypes.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportTypes.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/UnitySupportedImageTypeDeserializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/UnitySupportedImageTypeDeserializer.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/UnitySupportedImageTypeDeserializer.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/UnitySupportedImageTypeDeserializer.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/UnityTextureDeserializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnityTextureDeserializer.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/UnityTextureDeserializer.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnityTextureDeserializer.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/UnityTextureDeserializer.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnityTextureDeserializer.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/UnityTextureDeserializer.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnityTextureDeserializer.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Util/TextureExtensions.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureExtensions.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Util/TextureExtensions.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureExtensions.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Util/TextureExtensions.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureExtensions.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Texture/Util/TextureExtensions.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureExtensions.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable.png b/Assets/UniGLTF/Tests/UniGLTF/4x4_non_readable.png similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable.png rename to Assets/UniGLTF/Tests/UniGLTF/4x4_non_readable.png diff --git a/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable.png.meta b/Assets/UniGLTF/Tests/UniGLTF/4x4_non_readable.png.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable.png.meta rename to Assets/UniGLTF/Tests/UniGLTF/4x4_non_readable.png.meta diff --git a/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS b/Assets/UniGLTF/Tests/UniGLTF/4x4_non_readable_compressed.DDS similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS rename to Assets/UniGLTF/Tests/UniGLTF/4x4_non_readable_compressed.DDS diff --git a/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS.meta b/Assets/UniGLTF/Tests/UniGLTF/4x4_non_readable_compressed.DDS.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS.meta rename to Assets/UniGLTF/Tests/UniGLTF/4x4_non_readable_compressed.DDS.meta diff --git a/Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs b/Assets/UniGLTF/Tests/UniGLTF/CopyTextureTests.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs rename to Assets/UniGLTF/Tests/UniGLTF/CopyTextureTests.cs diff --git a/Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs.meta b/Assets/UniGLTF/Tests/UniGLTF/CopyTextureTests.cs.meta similarity index 71% rename from Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs.meta rename to Assets/UniGLTF/Tests/UniGLTF/CopyTextureTests.cs.meta index 77c2e167c..429c6574e 100644 --- a/Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs.meta +++ b/Assets/UniGLTF/Tests/UniGLTF/CopyTextureTests.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 -guid: 3b001f23191141369d3482cfebfaae2f +fileFormatVersion: 2 +guid: 3b001f23191141369d3482cfebfaae2f timeCreated: 1620903873 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Tests/MetallicRoughnessConverterTests.cs b/Assets/UniGLTF/Tests/UniGLTF/MetallicRoughnessConverterTests.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/MetallicRoughnessConverterTests.cs rename to Assets/UniGLTF/Tests/UniGLTF/MetallicRoughnessConverterTests.cs diff --git a/Assets/VRMShaders/GLTF/IO/Tests/MetallicRoughnessConverterTests.cs.meta b/Assets/UniGLTF/Tests/UniGLTF/MetallicRoughnessConverterTests.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/MetallicRoughnessConverterTests.cs.meta rename to Assets/UniGLTF/Tests/UniGLTF/MetallicRoughnessConverterTests.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Tests/PathObjectTests.cs b/Assets/UniGLTF/Tests/UniGLTF/PathObjectTests.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/PathObjectTests.cs rename to Assets/UniGLTF/Tests/UniGLTF/PathObjectTests.cs diff --git a/Assets/VRMShaders/GLTF/IO/Tests/PathObjectTests.cs.meta b/Assets/UniGLTF/Tests/UniGLTF/PathObjectTests.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/PathObjectTests.cs.meta rename to Assets/UniGLTF/Tests/UniGLTF/PathObjectTests.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Tests/TextureBytesTests.cs b/Assets/UniGLTF/Tests/UniGLTF/TextureBytesTests.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/TextureBytesTests.cs rename to Assets/UniGLTF/Tests/UniGLTF/TextureBytesTests.cs diff --git a/Assets/VRMShaders/GLTF/IO/Tests/TextureBytesTests.cs.meta b/Assets/UniGLTF/Tests/UniGLTF/TextureBytesTests.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/TextureBytesTests.cs.meta rename to Assets/UniGLTF/Tests/UniGLTF/TextureBytesTests.cs.meta diff --git a/Assets/VRM/Tests/SampleTests/VRM.Samples.Editor.Tests.asmdef b/Assets/VRM/Tests/SampleTests/VRM.Samples.Editor.Tests.asmdef index 6d0398534..2b072b417 100644 --- a/Assets/VRM/Tests/SampleTests/VRM.Samples.Editor.Tests.asmdef +++ b/Assets/VRM/Tests/SampleTests/VRM.Samples.Editor.Tests.asmdef @@ -1,13 +1,15 @@ { "name": "VRM.Samples.Editor.Tests", + "rootNamespace": "", "references": [ "GUID:05dd262a0c0a2f841b8252c8c3815582", "GUID:627491ce4646ac8469d7689ab146358b", "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:5f875fdc81c40184c8333b9d63c6ddd5", + "GUID:f9fe54bb3090be448aa10ac92648a614", "GUID:f7b2dd4e5e1e7264089dc065c45db910", "GUID:0eadcadee644f4e4cb96f0c11df10d89", "GUID:da3e51d19d51a544fa14d43fee843098", - "GUID:7da8a75dcade2144aab699032d7d7987", "GUID:27619889b8ba8c24980f49ee34dbb44a", "GUID:0acc523941302664db1f4e527237feb3" ], diff --git a/Assets/VRM/Tests/VRM.Tests.asmdef b/Assets/VRM/Tests/VRM.Tests.asmdef index 1c2d8cc9d..5d30901d9 100644 --- a/Assets/VRM/Tests/VRM.Tests.asmdef +++ b/Assets/VRM/Tests/VRM.Tests.asmdef @@ -1,12 +1,13 @@ { "name": "VRM.Tests", + "rootNamespace": "", "references": [ "GUID:05dd262a0c0a2f841b8252c8c3815582", "GUID:f7b2dd4e5e1e7264089dc065c45db910", "GUID:8d76e605759c3f64a957d63ef96ada7c", "GUID:5f875fdc81c40184c8333b9d63c6ddd5", + "GUID:f9fe54bb3090be448aa10ac92648a614", "GUID:da3e51d19d51a544fa14d43fee843098", - "GUID:7da8a75dcade2144aab699032d7d7987", "GUID:27619889b8ba8c24980f49ee34dbb44a", "GUID:0acc523941302664db1f4e527237feb3" ], diff --git a/Assets/VRM10/Tests/VRM10.Tests.asmdef b/Assets/VRM10/Tests/VRM10.Tests.asmdef index c045e954b..afe244664 100644 --- a/Assets/VRM10/Tests/VRM10.Tests.asmdef +++ b/Assets/VRM10/Tests/VRM10.Tests.asmdef @@ -1,11 +1,13 @@ { "name": "VRM10.Tests", + "rootNamespace": "", "references": [ "GUID:2ef84b520212e174a94668c7a0862d3b", "GUID:e47c917724578cc43b5506c17a27e9a0", "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:5f875fdc81c40184c8333b9d63c6ddd5", + "GUID:f9fe54bb3090be448aa10ac92648a614", "GUID:da3e51d19d51a544fa14d43fee843098", - "GUID:7da8a75dcade2144aab699032d7d7987", "GUID:27619889b8ba8c24980f49ee34dbb44a", "GUID:0acc523941302664db1f4e527237feb3" ], diff --git a/Assets/VRMShaders/GLTF/IO/Editor.meta b/Assets/VRMShaders/GLTF/IO/Editor.meta deleted file mode 100644 index ac317874a..000000000 --- a/Assets/VRMShaders/GLTF/IO/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 58204522f08a6fe4f846a5817a37f902 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef b/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef deleted file mode 100644 index 473e41270..000000000 --- a/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "VRMShaders.GLTF.IO.Editor", - "references": [ - "GUID:da3e51d19d51a544fa14d43fee843098" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef.meta b/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef.meta deleted file mode 100644 index 8c9bfda5c..000000000 --- a/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7da8a75dcade2144aab699032d7d7987 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture.meta b/Assets/VRMShaders/GLTF/IO/Runtime/Texture.meta deleted file mode 100644 index 97ebb036e..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: c8e5696eaaed4b0ab448df03aca36e51 -timeCreated: 1634200936 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter.meta b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter.meta deleted file mode 100644 index fcfb28b78..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: cb69c8156eb34a5ab1a01e633f10f6cb -timeCreated: 1634200996 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer.meta b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer.meta deleted file mode 100644 index dcb3c72dc..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: f0963595b58941c2807d9c56974ad610 -timeCreated: 1634200949 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Util.meta b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Util.meta deleted file mode 100644 index 0469fb1ea..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Util.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d2bde87443a94e239e6fbadee0acc5d1 -timeCreated: 1634201150 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Tests.meta b/Assets/VRMShaders/GLTF/IO/Tests.meta deleted file mode 100644 index 918f681e5..000000000 --- a/Assets/VRMShaders/GLTF/IO/Tests.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7b9c0681fd83aa3439d3221de54fdacf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef b/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef deleted file mode 100644 index ff809fae7..000000000 --- a/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "VRMShaders.GLTF.IO.Tests", - "references": [ - "GUID:da3e51d19d51a544fa14d43fee843098", - "GUID:7da8a75dcade2144aab699032d7d7987", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef.meta b/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef.meta deleted file mode 100644 index 320d01208..000000000 --- a/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0e517ae7a2a124241a6da9588530ce79 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From 00c74f684fd9fdd271786ff5336356e11a2eb058 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 20 Jul 2024 23:13:34 +0900 Subject: [PATCH 4/9] mv top level IO definitions from VRMShaders to UniGLTF --- .../IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/ColorSpace.cs | 0 .../Runtime => UniGLTF/Runtime/UniGLTF/IO}/ColorSpace.cs.meta | 4 ++-- .../Runtime/UniGLTF/IO}/IResponsibilityForDestroyObjects.cs | 0 .../UniGLTF/IO}/IResponsibilityForDestroyObjects.cs.meta | 0 .../IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/PathObject.cs | 0 .../Runtime => UniGLTF/Runtime/UniGLTF/IO}/PathObject.cs.meta | 0 .../IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/SubAssetKey.cs | 0 .../Runtime/UniGLTF/IO}/SubAssetKey.cs.meta | 0 .../IO/Runtime/Util => UniGLTF/Runtime/UniGLTF/IO}/Symbols.cs | 0 .../Util => UniGLTF/Runtime/UniGLTF/IO}/Symbols.cs.meta | 0 .../Runtime/UniGLTF/IO}/UnityObjectDestroyer.cs | 0 .../Runtime/UniGLTF/IO}/UnityObjectDestroyer.cs.meta | 0 Assets/VRMShaders/GLTF/IO/Runtime/Util.meta | 3 --- 13 files changed, 2 insertions(+), 5 deletions(-) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/ColorSpace.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/ColorSpace.cs.meta (71%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/IResponsibilityForDestroyObjects.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/IResponsibilityForDestroyObjects.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/PathObject.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/PathObject.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/SubAssetKey.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/SubAssetKey.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Util => UniGLTF/Runtime/UniGLTF/IO}/Symbols.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Util => UniGLTF/Runtime/UniGLTF/IO}/Symbols.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Util => UniGLTF/Runtime/UniGLTF/IO}/UnityObjectDestroyer.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime/Util => UniGLTF/Runtime/UniGLTF/IO}/UnityObjectDestroyer.cs.meta (100%) delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/Util.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/ColorSpace.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/ColorSpace.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/ColorSpace.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs.meta similarity index 71% rename from Assets/VRMShaders/GLTF/IO/Runtime/ColorSpace.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs.meta index 1feb2b186..7e99c0d09 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/ColorSpace.cs.meta +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 -guid: 5e97eeb2080e43e18ba57f1a3820a7e6 +fileFormatVersion: 2 +guid: 5e97eeb2080e43e18ba57f1a3820a7e6 timeCreated: 1620901197 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/IResponsibilityForDestroyObjects.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/IResponsibilityForDestroyObjects.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/IResponsibilityForDestroyObjects.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/IResponsibilityForDestroyObjects.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/IResponsibilityForDestroyObjects.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/IResponsibilityForDestroyObjects.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/IResponsibilityForDestroyObjects.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/IResponsibilityForDestroyObjects.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/PathObject.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/PathObject.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/PathObject.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/PathObject.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/PathObject.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/PathObject.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/PathObject.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/PathObject.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/SubAssetKey.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/SubAssetKey.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/SubAssetKey.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/SubAssetKey.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/SubAssetKey.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/SubAssetKey.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/SubAssetKey.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/SubAssetKey.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Util/Symbols.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/Symbols.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Util/Symbols.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/Symbols.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Util/Symbols.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/Symbols.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Util/Symbols.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/Symbols.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Util/UnityObjectDestroyer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/UnityObjectDestroyer.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Util/UnityObjectDestroyer.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/UnityObjectDestroyer.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Util/UnityObjectDestroyer.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/UnityObjectDestroyer.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/Util/UnityObjectDestroyer.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/UnityObjectDestroyer.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Util.meta b/Assets/VRMShaders/GLTF/IO/Runtime/Util.meta deleted file mode 100644 index 096a9711a..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Util.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: e7d2e0d1056e468d973d30fa6363b854 -timeCreated: 1634201722 \ No newline at end of file From 5f8c93003126b03b779ff3a269028fe90d978672 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 20 Jul 2024 23:14:40 +0900 Subject: [PATCH 5/9] mv AwaitCaller definitions from VRMShaders to UniGLTF --- .../IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller.meta | 0 .../Runtime/UniGLTF/IO}/AwaitCaller/IAwaitCaller.cs | 0 .../Runtime/UniGLTF/IO}/AwaitCaller/IAwaitCaller.cs.meta | 0 .../Runtime/UniGLTF/IO}/AwaitCaller/ImmediateCaller.cs | 0 .../Runtime/UniGLTF/IO}/AwaitCaller/ImmediateCaller.cs.meta | 0 .../Runtime/UniGLTF/IO}/AwaitCaller/NextFrameTaskScheduler.cs | 0 .../UniGLTF/IO}/AwaitCaller/NextFrameTaskScheduler.cs.meta | 0 .../Runtime/UniGLTF/IO}/AwaitCaller/RuntimeOnlyAwaitCaller.cs | 0 .../UniGLTF/IO}/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta | 0 .../UniGLTF/IO}/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs | 0 .../IO}/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta | 0 .../Runtime/UniGLTF/IO}/AwaitCaller/TinyManagedTaskScheduler.cs | 0 .../UniGLTF/IO}/AwaitCaller/TinyManagedTaskScheduler.cs.meta | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/IAwaitCaller.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/IAwaitCaller.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/ImmediateCaller.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/ImmediateCaller.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/NextFrameTaskScheduler.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/NextFrameTaskScheduler.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/RuntimeOnlyAwaitCaller.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/TinyManagedTaskScheduler.cs (100%) rename Assets/{VRMShaders/GLTF/IO/Runtime => UniGLTF/Runtime/UniGLTF/IO}/AwaitCaller/TinyManagedTaskScheduler.cs.meta (100%) diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/IAwaitCaller.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/IAwaitCaller.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/IAwaitCaller.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/IAwaitCaller.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/ImmediateCaller.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/ImmediateCaller.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/ImmediateCaller.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/ImmediateCaller.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/NextFrameTaskScheduler.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/NextFrameTaskScheduler.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/NextFrameTaskScheduler.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/NextFrameTaskScheduler.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyAwaitCaller.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyAwaitCaller.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/TinyManagedTaskScheduler.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/TinyManagedTaskScheduler.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/TinyManagedTaskScheduler.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/AwaitCaller/TinyManagedTaskScheduler.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs.meta From 99467dbe7086e12559fdcfd74f4ab2753b6ebe19 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 20 Jul 2024 23:15:08 +0900 Subject: [PATCH 6/9] remove unused directories --- Assets/VRMShaders/GLTF/IO.meta | 8 ------- Assets/VRMShaders/GLTF/IO/Runtime.meta | 8 ------- .../Runtime/VRMShaders.GLTF.IO.Runtime.asmdef | 22 ------------------- .../VRMShaders.GLTF.IO.Runtime.asmdef.meta | 7 ------ 4 files changed, 45 deletions(-) delete mode 100644 Assets/VRMShaders/GLTF/IO.meta delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime.meta delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef.meta diff --git a/Assets/VRMShaders/GLTF/IO.meta b/Assets/VRMShaders/GLTF/IO.meta deleted file mode 100644 index 9a32289e5..000000000 --- a/Assets/VRMShaders/GLTF/IO.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 817051ccab3a4cc4986dc955681fac6f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/GLTF/IO/Runtime.meta b/Assets/VRMShaders/GLTF/IO/Runtime.meta deleted file mode 100644 index a4e70ac3d..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fcad5106da772b9478acad653777c2c8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef b/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef deleted file mode 100644 index 36313b162..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "VRMShaders.GLTF.IO.Runtime", - "rootNamespace": "", - "references": [ - "GUID:3d354272d3f2f4c3387dbccbaebd0f60" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [ - { - "name": "com.unity.cloud.ktx", - "expression": "3.0.0", - "define": "USE_COM_UNITY_CLOUD_KTX" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef.meta b/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef.meta deleted file mode 100644 index d694d87ec..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: da3e51d19d51a544fa14d43fee843098 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From d0dcdf09fc10dd5fb527d6189bbdca06377c6b9b Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 20 Jul 2024 23:20:37 +0900 Subject: [PATCH 7/9] UniHumanoid can't depends on UniGLTF --- Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs | 2 +- Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs b/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs index 4b38f6b66..708dd6544 100644 --- a/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs +++ b/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs @@ -252,7 +252,7 @@ namespace UniHumanoid } else { - if (VRMShaders.Symbols.VRM_DEVELOP) + if (Application.isEditor) { Debug.LogWarningFormat("{0} not found", headTail.Head); } diff --git a/Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef b/Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef index 603a943f7..825f3bbc2 100644 --- a/Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef +++ b/Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef @@ -2,8 +2,7 @@ "name": "UniHumanoid", "rootNamespace": "", "references": [ - "GUID:1cd941934d098654fa21a13f28346412", - "GUID:da3e51d19d51a544fa14d43fee843098" + "GUID:1cd941934d098654fa21a13f28346412" ], "includePlatforms": [], "excludePlatforms": [], From e9da5e2b7bcb096e86fc5a37c581f242d1197221 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 20 Jul 2024 23:47:45 +0900 Subject: [PATCH 8/9] mv VRMShaders namespace to UniGLTF --- .../Editor/UniGLTF/ExportDialog/ExportDialogState.cs | 1 - .../UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs | 2 -- .../Editor/UniGLTF/IO/Texture/EditorTextureUtility.cs | 2 +- .../UniGLTF/IO/Texture/Exporter/EditorTextureSerializer.cs | 2 +- .../IO/Texture/Importer/TextureImporterConfigurator.cs | 3 +-- .../UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs | 3 +-- .../UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs | 2 +- .../Editor/UniGLTF/ScriptedImporter/RemapEditorAnimation.cs | 5 ++--- .../Editor/UniGLTF/ScriptedImporter/RemapEditorBase.cs | 4 ++-- .../Editor/UniGLTF/ScriptedImporter/RemapEditorMaterial.cs | 2 +- .../ScriptedImporter/RemapScriptedImporterEditorBase.cs | 4 ++-- .../Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs | 2 -- .../UniGLTF/Runtime/Extensions/ColorConversionExtensions.cs | 1 - Assets/UniGLTF/Runtime/MeshUtility/BoneMeshEraser.cs | 1 - Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs | 2 -- Assets/UniGLTF/Runtime/MeshUtility/MeshFreezer.cs | 2 -- .../UniGLTF/IO/AnimationIO/Import/AnimationClipFactory.cs | 2 +- .../UniGLTF/IO/AnimationIO/Import/AnimationImporterUtil.cs | 5 ++--- .../UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs | 2 +- .../Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs | 2 +- .../UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs | 2 +- .../UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs | 2 +- .../IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs | 2 +- .../UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs | 2 +- Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs | 2 +- Assets/UniGLTF/Runtime/UniGLTF/IO/GltfUtility.cs | 1 - .../Runtime/UniGLTF/IO/IResponsibilityForDestroyObjects.cs | 2 +- Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs | 1 - .../UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs | 1 - .../BuiltInRP/Export/BuiltInGltfMaterialExporter.cs | 1 - .../Export/Materials/BuiltInFallbackMaterialExporter.cs | 2 -- .../Export/Materials/BuiltInGenericUnlitMaterialExporter.cs | 2 -- .../Export/Materials/BuiltInStandardMaterialExporter.cs | 2 -- .../Export/Materials/BuiltInUniUnlitMaterialExporter.cs | 2 -- .../Import/BuiltInGltfMaterialDescriptorGenerator.cs | 2 -- .../Import/Materials/BuiltInGltfDefaultMaterialImporter.cs | 1 - .../Import/Materials/BuiltInGltfPbrMaterialImporter.cs | 3 --- .../Import/Materials/BuiltInGltfUnlitMaterialImporter.cs | 2 -- .../UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs | 1 - .../UniGLTF/IO/MaterialIO/Import/GltfMaterialImportUtils.cs | 3 +-- .../IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs | 4 +--- .../UniGLTF/IO/MaterialIO/Import/MaterialDescriptor.cs | 2 +- .../Runtime/UniGLTF/IO/MaterialIO/Import/MaterialFactory.cs | 3 +-- .../IO/MaterialIO/Import/MaterialImporterParamExtensions.cs | 2 -- .../URP/Import/Materials/UrpGltfDefaultMaterialImporter.cs | 1 - .../URP/Import/Materials/UrpGltfPbrMaterialImporter.cs | 2 -- .../URP/Import/UrpGltfMaterialDescriptorGenerator.cs | 2 -- Assets/UniGLTF/Runtime/UniGLTF/IO/MeshIO/MeshUploader.cs | 1 - Assets/UniGLTF/Runtime/UniGLTF/IO/PathObject.cs | 2 +- Assets/UniGLTF/Runtime/UniGLTF/IO/SubAssetKey.cs | 2 +- Assets/UniGLTF/Runtime/UniGLTF/IO/Symbols.cs | 2 +- .../UniGLTF/IO/TextureIO/Converter/NormalConverter.cs | 2 +- .../Converter/OcclusionMetallicRoughnessConverter.cs | 2 +- .../UniGLTF/IO/TextureIO/Converter/TextureConverter.cs | 2 +- .../UniGLTF/IO/TextureIO/Export/GltfTextureExporter.cs | 2 -- .../Runtime/UniGLTF/IO/TextureIO/Export/ITextureExporter.cs | 2 +- .../UniGLTF/IO/TextureIO/Export/ITextureSerializer.cs | 2 +- .../UniGLTF/IO/TextureIO/Export/RuntimeTextureSerializer.cs | 2 +- .../UniGLTF/IO/TextureIO/Export/TextureExportParam.cs | 2 +- .../UniGLTF/IO/TextureIO/Export/TextureExportTypes.cs | 2 +- .../Runtime/UniGLTF/IO/TextureIO/Export/TextureExporter.cs | 2 +- .../UniGLTF/IO/TextureIO/Import/DeserializingTextureInfo.cs | 2 +- .../UniGLTF/IO/TextureIO/Import/GltfPbrTextureImporter.cs | 1 - .../IO/TextureIO/Import/GltfTextureDescriptorGenerator.cs | 6 +----- .../UniGLTF/IO/TextureIO/Import/GltfTextureImporter.cs | 5 +---- .../IO/TextureIO/Import/ITextureDescriptorGenerator.cs | 4 +--- .../UniGLTF/IO/TextureIO/Import/ITextureDeserializer.cs | 2 +- .../UniGLTF/IO/TextureIO/Import/KtxTextureDeserializer.cs | 2 +- .../Runtime/UniGLTF/IO/TextureIO/Import/SamplerParam.cs | 2 +- .../UniGLTF/IO/TextureIO/Import/TextureDescriptor.cs | 2 +- .../UniGLTF/IO/TextureIO/Import/TextureDescriptorSet.cs | 2 +- .../Runtime/UniGLTF/IO/TextureIO/Import/TextureFactory.cs | 2 +- .../UniGLTF/IO/TextureIO/Import/TextureImportName.cs | 2 +- .../UniGLTF/IO/TextureIO/Import/TextureImportTypes.cs | 2 +- .../TextureIO/Import/UnitySupportedImageTypeDeserializer.cs | 2 +- .../UniGLTF/IO/TextureIO/Import/UnityTextureDeserializer.cs | 2 +- .../Runtime/UniGLTF/IO/TextureIO/TextureExtensions.cs | 2 +- .../Runtime/UniGLTF/IO/TextureIO/TextureSamplerUtil.cs | 1 - Assets/UniGLTF/Runtime/UniGLTF/IO/UnityObjectDestroyer.cs | 2 +- Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs | 2 -- Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs | 1 - Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef | 2 -- Assets/UniGLTF/Tests/UniGLTF/CopyTextureTests.cs | 5 ++--- .../UniGLTF/Tests/UniGLTF/EditorTextureSerializerTests.cs | 6 +----- Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs | 1 - Assets/UniGLTF/Tests/UniGLTF/MaterialTests.cs | 4 +--- .../Tests/UniGLTF/MetallicRoughnessConverterTests.cs | 2 +- Assets/UniGLTF/Tests/UniGLTF/PathObjectTests.cs | 6 ++---- Assets/UniGLTF/Tests/UniGLTF/TextureBytesTests.cs | 2 +- Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs | 1 - Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs | 1 - Assets/UniGLTF_Samples/GltfViewer/GltfViewer.cs | 2 +- .../GltfViewer/OpenFileDialog/OpenFileDialog.cs | 4 ++-- Assets/VRM/Editor/Format/VRMEditorExporter.cs | 1 - Assets/VRM/Editor/Format/VRMEditorImporterContext.cs | 2 -- Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs | 4 +--- Assets/VRM/Editor/VRM.Editor.asmdef | 2 -- Assets/VRM/Runtime/BlendShape/PreviewSceneManager.cs | 1 - .../Export/BuiltInVrmExtensionMaterialPropertyExporter.cs | 3 +-- .../BuiltInRP/Export/BuiltInVrmMaterialExporter.cs | 1 - .../Export/Materials/BuiltInVrmMToonMaterialExporter.cs | 3 +-- .../Import/BuiltInVrmMaterialDescriptorGenerator.cs | 1 - .../Import/Materials/BuiltInVrmMToonMaterialImporter.cs | 1 - .../BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs | 1 - .../URP/Import/UrpVrmMaterialDescriptorGenerator.cs | 1 - Assets/VRM/Runtime/IO/VRMExporter.cs | 1 - Assets/VRM/Runtime/IO/VRMImporterContext.cs | 1 - Assets/VRM/Runtime/IO/VRMImporterContextExtensions.cs | 2 +- Assets/VRM/Runtime/IO/VRMMToonTextureImporter.cs | 1 - Assets/VRM/Runtime/IO/VrmTextureDescriptorGenerator.cs | 4 +--- Assets/VRM/Runtime/IO/VrmUtility.cs | 1 - Assets/VRM/Runtime/SpringBone/FastSpringBoneReplacer.cs | 2 +- Assets/VRM/Tests/MToonTest.cs | 1 - Assets/VRM/Tests/SampleTests/VRMImportExportTests.cs | 1 - Assets/VRM/Tests/SampleTests/VRMMaterialTests.cs | 1 - Assets/VRM/Tests/VRMLoadTests.cs | 1 - Assets/VRM/Tests/VRMTextureEnumerateTests.cs | 3 +-- Assets/VRM/Tests/VrmDividedMeshTests.cs | 1 - Assets/VRM10/Editor/MeshUtility/Vrm10ExpressionUpdater.cs | 3 ++- Assets/VRM10/Editor/ScriptedImporter/RemapEditorVrm.cs | 2 +- .../Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs | 4 ++-- .../Editor/ScriptedImporter/VrmScriptedImporterImpl.cs | 4 ++-- Assets/VRM10/Editor/Vrm10ExportDialog.cs | 2 -- Assets/VRM10/Editor/Vrm10InstanceEditor.cs | 2 +- Assets/VRM10/Runtime/Components/Expression/ExpressionKey.cs | 2 +- Assets/VRM10/Runtime/Components/VRM10Object/VRM10Object.cs | 2 +- .../Components/VRM10Object/VRM10ObjectFirstPerson.cs | 2 +- Assets/VRM10/Runtime/IO/ExpressionExtensions.cs | 5 +++-- .../Export/Materials/BuiltInVrm10MToonMaterialExporter.cs | 3 +-- .../Import/Materials/BuiltInVrm10MToonMaterialImporter.cs | 3 +-- Assets/VRM10/Runtime/IO/Vrm10Data.cs | 2 +- Assets/VRM10/Runtime/IO/Vrm10Importer.cs | 4 +--- Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs | 3 ++- .../Runtime/Migration/Materials/MigrationMToonMaterial.cs | 2 +- .../Runtime/Migration/Materials/MigrationPbrMaterial.cs | 2 +- Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs | 2 +- Assets/VRM10/Tests/ApiSampleTests.cs | 2 -- Assets/VRM10/Tests/LoadTests.cs | 2 +- Assets/VRM10/Tests/MaterialImportTests.cs | 1 - Assets/VRM10/Tests/MigrationTests.cs | 4 +--- Assets/VRM10/Tests/Vrm10ApiTests.cs | 2 +- Assets/VRM10_Samples/SimpleVrma/SimpleVrma.cs | 3 +-- .../VRM10FirstPersonSample/VRM10RuntimeLoader.cs | 4 ++-- Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs | 1 - .../MigrateExporter/MigrateExporter.cs | 5 +++-- Assets/VRM_Samples/FirstPersonSample/VRMRuntimeLoader.cs | 3 +-- .../VRM_Samples/RuntimeExporterSample/VRMRuntimeExporter.cs | 3 +-- Assets/VRM_Samples/SimpleViewer/ViewerUI.cs | 2 -- 148 files changed, 107 insertions(+), 225 deletions(-) diff --git a/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs index e280d9b59..85fbbbfba 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using UnityEditor; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs index 1f6b4b32e..b05c56076 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; using System.IO; -using System.Linq; using UnityEditor; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/EditorTextureUtility.cs b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/EditorTextureUtility.cs index 45d088afd..9434a5519 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/EditorTextureUtility.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/EditorTextureUtility.cs @@ -3,7 +3,7 @@ using System.Reflection; using UnityEditor; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { internal static class EditorTextureUtility { diff --git a/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter/EditorTextureSerializer.cs b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter/EditorTextureSerializer.cs index 6104064a3..32b92d52a 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter/EditorTextureSerializer.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter/EditorTextureSerializer.cs @@ -3,7 +3,7 @@ using System.IO; using UnityEditor; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public sealed class EditorTextureSerializer : ITextureSerializer { diff --git a/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer/TextureImporterConfigurator.cs b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer/TextureImporterConfigurator.cs index e59fc340b..ccf176dab 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer/TextureImporterConfigurator.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer/TextureImporterConfigurator.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using UnityEditor; using UnityEngine; - -namespace VRMShaders +namespace UniGLTF { public static class TextureImporterConfigurator { diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs index 7e249821c..19fd76903 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs @@ -2,8 +2,7 @@ using UnityEditor; using UnityEngine; using System.IO; using System.Linq; -using System.Collections.Generic; -using VRMShaders; + #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; #else diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs index d6215598d..4637c4ecb 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs @@ -1,6 +1,6 @@ using UnityEngine; using System.Linq; -using VRMShaders; + #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; #else diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorAnimation.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorAnimation.cs index c4d6538f7..c5da816ce 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorAnimation.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorAnimation.cs @@ -1,13 +1,12 @@ using System.Collections.Generic; -using System.Linq; using UnityEditor; +using UnityEngine; + #if UNITY_2020_1_OR_NEWER using UnityEditor.AssetImporters; #else using UnityEditor.Experimental.AssetImporters; #endif -using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorBase.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorBase.cs index fa7da1138..2b9ac1f9f 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorBase.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorBase.cs @@ -3,13 +3,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using UnityEditor; +using UnityEngine; + #if UNITY_2020_1_OR_NEWER using UnityEditor.AssetImporters; #else using UnityEditor.Experimental.AssetImporters; #endif -using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorMaterial.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorMaterial.cs index 88bdfdd42..eae95fb27 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorMaterial.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorMaterial.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using UnityEditor; using UnityEngine; -using VRMShaders; + #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; #else diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapScriptedImporterEditorBase.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapScriptedImporterEditorBase.cs index bf4803adf..89fe736f6 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapScriptedImporterEditorBase.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapScriptedImporterEditorBase.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Linq; using UnityEditor; +using UnityEngine; + #if UNITY_2020_1_OR_NEWER using UnityEditor.AssetImporters; #else using UnityEditor.Experimental.AssetImporters; #endif -using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs index 8077b58b3..4fe3e5fb7 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs @@ -3,9 +3,7 @@ using System.Collections.Generic; using System.IO; using UnityEngine; using UnityEditor; -using UniGLTF; using System.Linq; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/Extensions/ColorConversionExtensions.cs b/Assets/UniGLTF/Runtime/Extensions/ColorConversionExtensions.cs index e78ab1556..4e67784d6 100644 --- a/Assets/UniGLTF/Runtime/Extensions/ColorConversionExtensions.cs +++ b/Assets/UniGLTF/Runtime/Extensions/ColorConversionExtensions.cs @@ -1,6 +1,5 @@ using System; using UnityEngine; -using ColorSpace = VRMShaders.ColorSpace; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/MeshUtility/BoneMeshEraser.cs b/Assets/UniGLTF/Runtime/MeshUtility/BoneMeshEraser.cs index 17794ca78..de64ff30a 100644 --- a/Assets/UniGLTF/Runtime/MeshUtility/BoneMeshEraser.cs +++ b/Assets/UniGLTF/Runtime/MeshUtility/BoneMeshEraser.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using UnityEngine; -using VRMShaders; namespace UniGLTF.MeshUtility { diff --git a/Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs b/Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs index 2c1c01747..43fa28dad 100644 --- a/Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs +++ b/Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs @@ -1,7 +1,5 @@ using UnityEngine; using System.Linq; -using VRMShaders; -using System; using System.Collections.Generic; diff --git a/Assets/UniGLTF/Runtime/MeshUtility/MeshFreezer.cs b/Assets/UniGLTF/Runtime/MeshUtility/MeshFreezer.cs index 2b9e3eaf0..30b1ecc74 100644 --- a/Assets/UniGLTF/Runtime/MeshUtility/MeshFreezer.cs +++ b/Assets/UniGLTF/Runtime/MeshUtility/MeshFreezer.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Linq; using UnityEngine; -using UnityEngine.UIElements; -using VRMShaders; namespace UniGLTF.MeshUtility { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationClipFactory.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationClipFactory.cs index d570b7df2..68ba35093 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationClipFactory.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationClipFactory.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public class AnimationClipFactory : IResponsibilityForDestroyObjects { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationImporterUtil.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationImporterUtil.cs index 735a207ce..3d4b4efe4 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationImporterUtil.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationImporterUtil.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Collections.Generic; using System.Threading.Tasks; using UnityEngine; -using VRMShaders; namespace UniGLTF { @@ -346,11 +345,11 @@ namespace UniGLTF }); } - public static IEnumerable EnumerateSubAssetKeys(glTF gltf) + public static IEnumerable EnumerateSubAssetKeys(glTF gltf) { foreach (var gltfAnimation in gltf.animations) { - yield return new VRMShaders.SubAssetKey(typeof(AnimationClip), gltfAnimation.name); + yield return new SubAssetKey(typeof(AnimationClip), gltfAnimation.name); } } } diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs index 877ae8ae0..097f944dd 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace VRMShaders +namespace UniGLTF { /// /// ImporterContext の 非同期実行 LoadAsync を補助する。 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs index db71fe818..ef68b5b19 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace VRMShaders +namespace UniGLTF { /// /// 同期実行 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs index 27df7af6a..240baac13 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs @@ -2,7 +2,7 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace VRMShaders +namespace UniGLTF { internal sealed class NextFrameTaskScheduler { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs index b583465ff..5210cfc7e 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace VRMShaders +namespace UniGLTF { /// /// Runtime (Build 後と、Editor Playing) での非同期ロードを実現する AwaitCaller. diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs index 97e8597fd..843a65f10 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace VRMShaders +namespace UniGLTF { /// /// Runtime (Build 後と、Editor Playing) での非同期ロードを実現する AwaitCaller. diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs index 820feb7f9..5f248230a 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Concurrent; -namespace VRMShaders +namespace UniGLTF { internal sealed class TinyManagedTaskScheduler { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs index 26332a154..74c3e182e 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs @@ -1,4 +1,4 @@ -namespace VRMShaders +namespace UniGLTF { public enum ColorSpace { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfUtility.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfUtility.cs index dd2238c18..d0a26a01e 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfUtility.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfUtility.cs @@ -2,7 +2,6 @@ using System; using System.IO; using System.Threading.Tasks; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/IResponsibilityForDestroyObjects.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/IResponsibilityForDestroyObjects.cs index 00a7d675b..54008a348 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/IResponsibilityForDestroyObjects.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/IResponsibilityForDestroyObjects.cs @@ -1,6 +1,6 @@ using System; -namespace VRMShaders +namespace UniGLTF { public delegate void TakeResponsibilityForDestroyObjectFunc(SubAssetKey key, UnityEngine.Object obj); diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs index a2605d732..967fb0c07 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using UnityEngine; using System.Threading.Tasks; using UnityEngine.Profiling; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs index e804697f5..c5a3c09c2 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs @@ -1,6 +1,5 @@ using System; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/BuiltInGltfMaterialExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/BuiltInGltfMaterialExporter.cs index fe42f516d..75418208f 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/BuiltInGltfMaterialExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/BuiltInGltfMaterialExporter.cs @@ -1,5 +1,4 @@ using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInFallbackMaterialExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInFallbackMaterialExporter.cs index 73e093d76..593a5d623 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInFallbackMaterialExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInFallbackMaterialExporter.cs @@ -1,7 +1,5 @@ using System; using UnityEngine; -using VRMShaders; -using ColorSpace = VRMShaders.ColorSpace; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInGenericUnlitMaterialExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInGenericUnlitMaterialExporter.cs index 2692b32af..24b16ef31 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInGenericUnlitMaterialExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInGenericUnlitMaterialExporter.cs @@ -1,7 +1,5 @@ using System; using UnityEngine; -using VRMShaders; -using ColorSpace = VRMShaders.ColorSpace; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInStandardMaterialExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInStandardMaterialExporter.cs index d0dd69208..d4ee12cfc 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInStandardMaterialExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInStandardMaterialExporter.cs @@ -1,8 +1,6 @@ using System; using System.Linq; using UnityEngine; -using VRMShaders; -using ColorSpace = VRMShaders.ColorSpace; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInUniUnlitMaterialExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInUniUnlitMaterialExporter.cs index c4499e416..a1034307f 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInUniUnlitMaterialExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInUniUnlitMaterialExporter.cs @@ -1,8 +1,6 @@ using System; using UniGLTF.UniUnlit; using UnityEngine; -using VRMShaders; -using ColorSpace = VRMShaders.ColorSpace; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs index c91d60401..eda109fb4 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using UnityEngine; -using VRMShaders; - namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfDefaultMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfDefaultMaterialImporter.cs index ca2d4acc9..b59d94bc7 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfDefaultMaterialImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfDefaultMaterialImporter.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs index 8e19db3f5..0ca2cfcda 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; using UnityEngine; -using VRMShaders; -using ColorSpace = VRMShaders.ColorSpace; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs index 4bc74d2ce..d6ba97f21 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs @@ -2,8 +2,6 @@ using System.Collections.Generic; using UniGLTF.UniUnlit; using UnityEngine; -using VRMShaders; -using ColorSpace = VRMShaders.ColorSpace; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs index 883bc11fb..0f6b3790c 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs @@ -1,5 +1,4 @@ using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/GltfMaterialImportUtils.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/GltfMaterialImportUtils.cs index 27c676248..6d8f9d304 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/GltfMaterialImportUtils.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/GltfMaterialImportUtils.cs @@ -1,5 +1,4 @@ using UnityEngine; -using ColorSpace = VRMShaders.ColorSpace; namespace UniGLTF { @@ -50,7 +49,7 @@ namespace UniGLTF if (data.MigrationFlags.IsEmissiveFactorGamma) { - return emissiveFactor.ToColor3(VRMShaders.ColorSpace.sRGB, VRMShaders.ColorSpace.Linear); + return emissiveFactor.ToColor3(ColorSpace.sRGB, ColorSpace.Linear); } else { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs index c727bf601..522cc3e56 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs @@ -1,6 +1,4 @@ -using VRMShaders; - -namespace UniGLTF +namespace UniGLTF { /// /// 指定の index の glTFMaterial から Import できる Material の生成情報を生成する。 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptor.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptor.cs index 8d51b12ec..131181bea 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptor.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptor.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public sealed class MaterialDescriptor { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialFactory.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialFactory.cs index 0e578c92c..f54b4d160 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialFactory.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialFactory.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using UnityEngine; - -namespace VRMShaders +namespace UniGLTF { public delegate Task GetTextureAsyncFunc(TextureDescriptor texDesc, IAwaitCaller awaitCaller); diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialImporterParamExtensions.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialImporterParamExtensions.cs index d38d1c93f..3a6bf34b2 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialImporterParamExtensions.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialImporterParamExtensions.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfDefaultMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfDefaultMaterialImporter.cs index 2235009de..b6e3cd90d 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfDefaultMaterialImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfDefaultMaterialImporter.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs index be38188d8..dbc25e26d 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using UnityEngine; -using VRMShaders; -using ColorSpace = VRMShaders.ColorSpace; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs index b0a24cf9e..b1dcdff1e 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using UnityEngine; -using VRMShaders; - namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshIO/MeshUploader.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshIO/MeshUploader.cs index a97dc0665..337e30af9 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshIO/MeshUploader.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshIO/MeshUploader.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using UnityEngine; using UnityEngine.Profiling; using UnityEngine.Rendering; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/PathObject.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/PathObject.cs index 4ba004bfa..791e8e574 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/PathObject.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/PathObject.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEditor; #endif -namespace VRMShaders +namespace UniGLTF { /// /// UniGLTF.UnityPath (Assets の ひとつ上がルート) をすべてのパスが扱えるように拡張するのが趣旨。 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/SubAssetKey.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/SubAssetKey.cs index ffd1e18f7..08db98c04 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/SubAssetKey.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/SubAssetKey.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { /// /// UnityEditor.Experimental.AssetImporter.SourceAssetIdentifier に対応する diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/Symbols.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/Symbols.cs index 2308ce5f2..bb439bb1d 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/Symbols.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/Symbols.cs @@ -1,4 +1,4 @@ -namespace VRMShaders +namespace UniGLTF { public static class Symbols { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/NormalConverter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/NormalConverter.cs index ebb7589c6..41b503fdc 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/NormalConverter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/NormalConverter.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public static class NormalConverter { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/OcclusionMetallicRoughnessConverter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/OcclusionMetallicRoughnessConverter.cs index 873728647..b5fa1753f 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/OcclusionMetallicRoughnessConverter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/OcclusionMetallicRoughnessConverter.cs @@ -2,7 +2,7 @@ using System; using System.Linq; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { /// /// diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/TextureConverter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/TextureConverter.cs index 95320ecb3..cf93b08ac 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/TextureConverter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/TextureConverter.cs @@ -2,7 +2,7 @@ using System; using System.Linq; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public static class TextureConverter { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/GltfTextureExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/GltfTextureExporter.cs index 055821d81..fcb740111 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/GltfTextureExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/GltfTextureExporter.cs @@ -1,7 +1,5 @@ using System; using UnityEngine; -using VRMShaders; -using ColorSpace = VRMShaders.ColorSpace; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureExporter.cs index bb132fcae..13d0f903d 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureExporter.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { /// /// Texture を用途別に変換の要不要を判断して gltf.textures の index に対応させる機能。 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureSerializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureSerializer.cs index c14118b8c..0d9943b23 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureSerializer.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureSerializer.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRMShaders +namespace UniGLTF { /// /// Texture2D を入力として byte[] を得る機能 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/RuntimeTextureSerializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/RuntimeTextureSerializer.cs index c5894a8c4..14a9227c2 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/RuntimeTextureSerializer.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/RuntimeTextureSerializer.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public sealed class RuntimeTextureSerializer : ITextureSerializer { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportParam.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportParam.cs index 45aeac9a4..ecfc4286c 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportParam.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportParam.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { internal sealed class TextureExportParam { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportTypes.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportTypes.cs index 06c3804fe..d9b9d247f 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportTypes.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportTypes.cs @@ -1,4 +1,4 @@ -namespace VRMShaders +namespace UniGLTF { internal enum TextureExportTypes { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExporter.cs index 151f30242..4bad7b863 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExporter.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { /// /// glTF にエクスポートする変換方式を蓄えて index を確定させる。 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/DeserializingTextureInfo.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/DeserializingTextureInfo.cs index a7e6676d2..0ce853544 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/DeserializingTextureInfo.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/DeserializingTextureInfo.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRMShaders +namespace UniGLTF { /// /// ITextureDeserializer 実装者にテクスチャロード処理を委譲するために必要な情報. diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfPbrTextureImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfPbrTextureImporter.cs index e8fc3e10b..450351686 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfPbrTextureImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfPbrTextureImporter.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureDescriptorGenerator.cs index be3cc2f63..b0a4224b7 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureDescriptorGenerator.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using VRMShaders; - +using System.Collections.Generic; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureImporter.cs index b5c56298f..2832ff02c 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureImporter.cs @@ -1,9 +1,6 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using Unity.Collections; using UnityEngine; -using VRMShaders; - namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDescriptorGenerator.cs index 454f852b2..f41bb8888 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDescriptorGenerator.cs @@ -1,6 +1,4 @@ -using VRMShaders; - -namespace UniGLTF +namespace UniGLTF { /// /// glTF から Import できる、すべての Texture の生成情報を生成する。 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDeserializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDeserializer.cs index 26d39b559..48d9a0f2f 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDeserializer.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDeserializer.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { /// /// 単純に Texture2D アセットを生成する機能 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/KtxTextureDeserializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/KtxTextureDeserializer.cs index c53ea6809..5913be258 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/KtxTextureDeserializer.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/KtxTextureDeserializer.cs @@ -6,7 +6,7 @@ using UnityEngine; using KtxUnity; #endif -namespace VRMShaders +namespace UniGLTF { public sealed class KtxTextureDeserializer : ITextureDeserializer { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/SamplerParam.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/SamplerParam.cs index c69a604e3..fe26913b7 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/SamplerParam.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/SamplerParam.cs @@ -1,7 +1,7 @@ using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public readonly struct SamplerParam { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptor.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptor.cs index ac9b01850..bd71d3063 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptor.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptor.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { /// /// get bytes for diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptorSet.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptorSet.cs index a06ebd2c4..f85b6bfe5 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptorSet.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptorSet.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace VRMShaders +namespace UniGLTF { /// /// TextureImportParam の集合を Unique な集合にする。 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureFactory.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureFactory.cs index e4590d546..7de031287 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureFactory.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureFactory.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Linq; using System.Threading.Tasks; -namespace VRMShaders +namespace UniGLTF { public class TextureFactory : IResponsibilityForDestroyObjects { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportName.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportName.cs index f2d3a6c71..740828425 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportName.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportName.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace VRMShaders +namespace UniGLTF { public static class TextureImportName { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportTypes.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportTypes.cs index 214eb3f2e..730f99be2 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportTypes.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportTypes.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public enum TextureImportTypes { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs index 8952089a0..9f7753d72 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { /// /// Unity の ImageConversion.LoadImage を用いて PNG/JPG の読み込みを実現する diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnityTextureDeserializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnityTextureDeserializer.cs index f3858d44a..0cf6f775b 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnityTextureDeserializer.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnityTextureDeserializer.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { /// /// Runtime での Texture2D 生成を実現するデフォルトの実装 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureExtensions.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureExtensions.cs index f3a78038e..efdeeef1e 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureExtensions.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureExtensions.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRMShaders +namespace UniGLTF { internal static class TextureExtensions { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureSamplerUtil.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureSamplerUtil.cs index ed5d43248..f9f618a8d 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureSamplerUtil.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureSamplerUtil.cs @@ -1,6 +1,5 @@ using System; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/UnityObjectDestroyer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/UnityObjectDestroyer.cs index bf5df6e9f..7a05960df 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/UnityObjectDestroyer.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/UnityObjectDestroyer.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public static class UnityObjectDestroyer { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs index 25cf372a3..c3778bcfa 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs @@ -4,8 +4,6 @@ using System.Linq; using System.Text.RegularExpressions; using UniGLTF.MeshUtility; using UnityEngine; -using VRMShaders; - namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs b/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs index 73c3e7a33..d23e85241 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using UniGLTF.Utils; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef b/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef index bf3839155..f3e06d294 100644 --- a/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef +++ b/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef @@ -4,8 +4,6 @@ "references": [ "GUID:8d76e605759c3f64a957d63ef96ada7c", "GUID:5f875fdc81c40184c8333b9d63c6ddd5", - "GUID:da3e51d19d51a544fa14d43fee843098", - "GUID:7da8a75dcade2144aab699032d7d7987", "GUID:27619889b8ba8c24980f49ee34dbb44a", "GUID:0acc523941302664db1f4e527237feb3", "GUID:1cd941934d098654fa21a13f28346412" diff --git a/Assets/UniGLTF/Tests/UniGLTF/CopyTextureTests.cs b/Assets/UniGLTF/Tests/UniGLTF/CopyTextureTests.cs index daeeeec00..8170541d9 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/CopyTextureTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/CopyTextureTests.cs @@ -1,9 +1,8 @@ -using System.Linq; -using NUnit.Framework; +using NUnit.Framework; using UnityEditor; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public sealed class CopyTextureTests { diff --git a/Assets/UniGLTF/Tests/UniGLTF/EditorTextureSerializerTests.cs b/Assets/UniGLTF/Tests/UniGLTF/EditorTextureSerializerTests.cs index a72c42b24..67f824ff7 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/EditorTextureSerializerTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/EditorTextureSerializerTests.cs @@ -1,10 +1,6 @@ -using System; -using System.IO; -using System.Linq; -using NUnit.Framework; +using NUnit.Framework; using UnityEditor; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs b/Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs index 5c76b650d..7231079b6 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using NUnit.Framework; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Tests/UniGLTF/MaterialTests.cs b/Assets/UniGLTF/Tests/UniGLTF/MaterialTests.cs index 4ec781cc7..987378b20 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/MaterialTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/MaterialTests.cs @@ -1,9 +1,7 @@ -using System; -using NUnit.Framework; +using NUnit.Framework; using UnityEngine; using UniJSON; using System.Linq; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Tests/UniGLTF/MetallicRoughnessConverterTests.cs b/Assets/UniGLTF/Tests/UniGLTF/MetallicRoughnessConverterTests.cs index 4f3695c0f..344be7090 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/MetallicRoughnessConverterTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/MetallicRoughnessConverterTests.cs @@ -2,7 +2,7 @@ using System.Linq; using NUnit.Framework; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public class MetallicRoughnessConverterTests { diff --git a/Assets/UniGLTF/Tests/UniGLTF/PathObjectTests.cs b/Assets/UniGLTF/Tests/UniGLTF/PathObjectTests.cs index 1a14bda0d..2799607f2 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/PathObjectTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/PathObjectTests.cs @@ -1,9 +1,7 @@ -using System.Linq; -using NUnit.Framework; -using UnityEditor; +using NUnit.Framework; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public sealed class PathObjectTests { diff --git a/Assets/UniGLTF/Tests/UniGLTF/TextureBytesTests.cs b/Assets/UniGLTF/Tests/UniGLTF/TextureBytesTests.cs index 8ce7bc3ea..f4ef96a2f 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/TextureBytesTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/TextureBytesTests.cs @@ -2,7 +2,7 @@ using UnityEditor; using UnityEngine; -namespace VRMShaders +namespace UniGLTF { public class TextureBytesTests { diff --git a/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs b/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs index a68a0c64d..22dffefc7 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs @@ -3,7 +3,6 @@ using System.IO; using System.Linq; using NUnit.Framework; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs b/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs index af7ae8b20..5b918f109 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using UniJSON; using UnityEngine; -using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF_Samples/GltfViewer/GltfViewer.cs b/Assets/UniGLTF_Samples/GltfViewer/GltfViewer.cs index fcdc21b31..dc8596b53 100644 --- a/Assets/UniGLTF_Samples/GltfViewer/GltfViewer.cs +++ b/Assets/UniGLTF_Samples/GltfViewer/GltfViewer.cs @@ -31,7 +31,7 @@ namespace UniGLTF.GltfViewer LoadPathAsync(path); } - async void LoadPathAsync(VRMShaders.PathObject path) + async void LoadPathAsync(PathObject path) { if (_instance) { diff --git a/Assets/UniGLTF_Samples/GltfViewer/OpenFileDialog/OpenFileDialog.cs b/Assets/UniGLTF_Samples/GltfViewer/OpenFileDialog/OpenFileDialog.cs index 2da319a5b..47695f73c 100644 --- a/Assets/UniGLTF_Samples/GltfViewer/OpenFileDialog/OpenFileDialog.cs +++ b/Assets/UniGLTF_Samples/GltfViewer/OpenFileDialog/OpenFileDialog.cs @@ -2,10 +2,10 @@ namespace UniGLTF.GltfViewer { public static class OpenFileDialog { - public static VRMShaders.PathObject Show(string title, params string[] extensions) + public static PathObject Show(string title, params string[] extensions) { #if UNITY_STANDALONE_WIN - return VRMShaders.PathObject.FromFullPath(FileDialogForWindows.FileDialog(title, extensions)); + return PathObject.FromFullPath(FileDialogForWindows.FileDialog(title, extensions)); #else UnityEngine.Debug.LogWarning("Non-Windows runtime file dialogs are not yet implemented."); return default; diff --git a/Assets/VRM/Editor/Format/VRMEditorExporter.cs b/Assets/VRM/Editor/Format/VRMEditorExporter.cs index 3a126c349..f4b30ed58 100644 --- a/Assets/VRM/Editor/Format/VRMEditorExporter.cs +++ b/Assets/VRM/Editor/Format/VRMEditorExporter.cs @@ -6,7 +6,6 @@ using UniGLTF; using UniGLTF.MeshUtility; using UniGLTF.Utils; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs b/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs index 17640e7f7..9cdac0ce0 100644 --- a/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs +++ b/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; using UniGLTF; using UnityEditor; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs b/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs index 4aa6197d6..4edcfa423 100644 --- a/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs +++ b/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs @@ -5,8 +5,6 @@ using System.Linq; using UniGLTF; using UnityEditor; using UnityEngine; -using VRMShaders; - namespace VRM { @@ -86,7 +84,7 @@ namespace VRM var editor = new VRMEditorImporterContext(context, prefabPath); foreach (var textureInfo in context.TextureDescriptorGenerator.Get().GetEnumerable()) { - VRMShaders.TextureImporterConfigurator.Configure(textureInfo, context.TextureFactory.ExternalTextures); + TextureImporterConfigurator.Configure(textureInfo, context.TextureFactory.ExternalTextures); } var loaded = context.Load(); editor.SaveAsAsset(loaded); diff --git a/Assets/VRM/Editor/VRM.Editor.asmdef b/Assets/VRM/Editor/VRM.Editor.asmdef index 1f917e647..68f3ce2f4 100644 --- a/Assets/VRM/Editor/VRM.Editor.asmdef +++ b/Assets/VRM/Editor/VRM.Editor.asmdef @@ -4,8 +4,6 @@ "references": [ "GUID:05dd262a0c0a2f841b8252c8c3815582", "GUID:b7aa47b240b57de44a4b2021c143c9bf", - "GUID:da3e51d19d51a544fa14d43fee843098", - "GUID:7da8a75dcade2144aab699032d7d7987", "GUID:8d76e605759c3f64a957d63ef96ada7c", "GUID:5f875fdc81c40184c8333b9d63c6ddd5", "GUID:301b251fd9834274c9228e0532f444f7", diff --git a/Assets/VRM/Runtime/BlendShape/PreviewSceneManager.cs b/Assets/VRM/Runtime/BlendShape/PreviewSceneManager.cs index cc6285288..f7ea2d16f 100644 --- a/Assets/VRM/Runtime/BlendShape/PreviewSceneManager.cs +++ b/Assets/VRM/Runtime/BlendShape/PreviewSceneManager.cs @@ -2,7 +2,6 @@ using System.Linq; using UnityEngine; using System; -using VRMShaders; using UniGLTF; namespace VRM diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs index 84fb47e2a..34ee49446 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs @@ -2,8 +2,7 @@ using UniGLTF; using UniGLTF.ShaderPropExporter; using UnityEngine; -using VRMShaders; -using ColorSpace = VRMShaders.ColorSpace; +using ColorSpace = UniGLTF.ColorSpace; namespace VRM { diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmMaterialExporter.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmMaterialExporter.cs index 9b3f99216..8310545ae 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmMaterialExporter.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmMaterialExporter.cs @@ -1,7 +1,6 @@ using System; using UniGLTF; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInVrmMToonMaterialExporter.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInVrmMToonMaterialExporter.cs index a168e320e..704b86a88 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInVrmMToonMaterialExporter.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInVrmMToonMaterialExporter.cs @@ -2,8 +2,7 @@ using MToon; using UniGLTF; using UnityEngine; -using VRMShaders; -using ColorSpace = VRMShaders.ColorSpace; +using ColorSpace = UniGLTF.ColorSpace; using RenderMode = MToon.RenderMode; namespace VRM diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/BuiltInVrmMaterialDescriptorGenerator.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/BuiltInVrmMaterialDescriptorGenerator.cs index 91c4cfd9c..aae706af3 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/BuiltInVrmMaterialDescriptorGenerator.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/BuiltInVrmMaterialDescriptorGenerator.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using UniGLTF; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs index c855693f9..61185eabb 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using UniGLTF; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs index 4efb4533d..de3e7ada1 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs @@ -4,7 +4,6 @@ using System.Collections.ObjectModel; using MToon; using UniGLTF; using UnityEngine; -using VRMShaders; using RenderMode = MToon.RenderMode; namespace VRM diff --git a/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/UrpVrmMaterialDescriptorGenerator.cs b/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/UrpVrmMaterialDescriptorGenerator.cs index ac88061a7..85f1fae2d 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/UrpVrmMaterialDescriptorGenerator.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/UrpVrmMaterialDescriptorGenerator.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using UniGLTF; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Runtime/IO/VRMExporter.cs b/Assets/VRM/Runtime/IO/VRMExporter.cs index 1cb958b68..93c76757f 100644 --- a/Assets/VRM/Runtime/IO/VRMExporter.cs +++ b/Assets/VRM/Runtime/IO/VRMExporter.cs @@ -4,7 +4,6 @@ using UniGLTF; using UniGLTF.Utils; using UniJSON; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Runtime/IO/VRMImporterContext.cs b/Assets/VRM/Runtime/IO/VRMImporterContext.cs index 2e592ee07..9b1ee9683 100644 --- a/Assets/VRM/Runtime/IO/VRMImporterContext.cs +++ b/Assets/VRM/Runtime/IO/VRMImporterContext.cs @@ -5,7 +5,6 @@ using UniGLTF; using UnityEngine; using System.Threading.Tasks; using UniGLTF.Utils; -using VRMShaders; using Object = UnityEngine.Object; namespace VRM diff --git a/Assets/VRM/Runtime/IO/VRMImporterContextExtensions.cs b/Assets/VRM/Runtime/IO/VRMImporterContextExtensions.cs index 130d9fa0a..3d3ca8226 100644 --- a/Assets/VRM/Runtime/IO/VRMImporterContextExtensions.cs +++ b/Assets/VRM/Runtime/IO/VRMImporterContextExtensions.cs @@ -1,4 +1,4 @@ -using VRMShaders; +using UniGLTF; namespace VRM { diff --git a/Assets/VRM/Runtime/IO/VRMMToonTextureImporter.cs b/Assets/VRM/Runtime/IO/VRMMToonTextureImporter.cs index cdb3f94d7..108aa49d6 100644 --- a/Assets/VRM/Runtime/IO/VRMMToonTextureImporter.cs +++ b/Assets/VRM/Runtime/IO/VRMMToonTextureImporter.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using UniGLTF; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Runtime/IO/VrmTextureDescriptorGenerator.cs b/Assets/VRM/Runtime/IO/VrmTextureDescriptorGenerator.cs index 8a02a9bc0..34ac7d939 100644 --- a/Assets/VRM/Runtime/IO/VrmTextureDescriptorGenerator.cs +++ b/Assets/VRM/Runtime/IO/VrmTextureDescriptorGenerator.cs @@ -1,8 +1,6 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using UniGLTF; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Runtime/IO/VrmUtility.cs b/Assets/VRM/Runtime/IO/VrmUtility.cs index 19d320b26..34f08bea6 100644 --- a/Assets/VRM/Runtime/IO/VrmUtility.cs +++ b/Assets/VRM/Runtime/IO/VrmUtility.cs @@ -3,7 +3,6 @@ using System.IO; using System.Threading.Tasks; using UniGLTF; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Runtime/SpringBone/FastSpringBoneReplacer.cs b/Assets/VRM/Runtime/SpringBone/FastSpringBoneReplacer.cs index 356ab345c..10a623428 100644 --- a/Assets/VRM/Runtime/SpringBone/FastSpringBoneReplacer.cs +++ b/Assets/VRM/Runtime/SpringBone/FastSpringBoneReplacer.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using UniGLTF; using UnityEngine; using VRM.FastSpringBones.Blittables; using VRM.FastSpringBones.Components; -using VRMShaders; using Object = UnityEngine.Object; namespace VRM diff --git a/Assets/VRM/Tests/MToonTest.cs b/Assets/VRM/Tests/MToonTest.cs index c9d91a63c..da25735e7 100644 --- a/Assets/VRM/Tests/MToonTest.cs +++ b/Assets/VRM/Tests/MToonTest.cs @@ -3,7 +3,6 @@ using System.Linq; using NUnit.Framework; using UniGLTF; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Tests/SampleTests/VRMImportExportTests.cs b/Assets/VRM/Tests/SampleTests/VRMImportExportTests.cs index fae94b210..9cf0e3591 100644 --- a/Assets/VRM/Tests/SampleTests/VRMImportExportTests.cs +++ b/Assets/VRM/Tests/SampleTests/VRMImportExportTests.cs @@ -5,7 +5,6 @@ using UniGLTF.MeshUtility; using UniJSON; using UnityEngine; using System; -using VRMShaders; namespace VRM.Samples { diff --git a/Assets/VRM/Tests/SampleTests/VRMMaterialTests.cs b/Assets/VRM/Tests/SampleTests/VRMMaterialTests.cs index 08071b284..be91867ee 100644 --- a/Assets/VRM/Tests/SampleTests/VRMMaterialTests.cs +++ b/Assets/VRM/Tests/SampleTests/VRMMaterialTests.cs @@ -1,7 +1,6 @@ using NUnit.Framework; using UniGLTF; using UnityEngine; -using VRMShaders; namespace VRM.Samples { diff --git a/Assets/VRM/Tests/VRMLoadTests.cs b/Assets/VRM/Tests/VRMLoadTests.cs index ef2ac3042..eaef7fbe4 100644 --- a/Assets/VRM/Tests/VRMLoadTests.cs +++ b/Assets/VRM/Tests/VRMLoadTests.cs @@ -4,7 +4,6 @@ using System.IO; using NUnit.Framework; using UniGLTF; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM/Tests/VRMTextureEnumerateTests.cs b/Assets/VRM/Tests/VRMTextureEnumerateTests.cs index 29c292d45..3a83ab4b2 100644 --- a/Assets/VRM/Tests/VRMTextureEnumerateTests.cs +++ b/Assets/VRM/Tests/VRMTextureEnumerateTests.cs @@ -4,7 +4,6 @@ using System.Linq; using NUnit.Framework; using UniGLTF; - namespace VRM { @@ -141,7 +140,7 @@ namespace VRM }; // 2系統ある？ - Assert.IsTrue(BuiltInVrmMToonMaterialImporter.TryCreateParam(data, vrm, 0, out VRMShaders.MaterialDescriptor matDesc)); + Assert.IsTrue(BuiltInVrmMToonMaterialImporter.TryCreateParam(data, vrm, 0, out var matDesc)); Assert.AreEqual(1, matDesc.TextureSlots.Count); var items = new VrmTextureDescriptorGenerator(data, vrm).Get().GetEnumerable().ToArray(); diff --git a/Assets/VRM/Tests/VrmDividedMeshTests.cs b/Assets/VRM/Tests/VrmDividedMeshTests.cs index f23744e49..543b10486 100644 --- a/Assets/VRM/Tests/VrmDividedMeshTests.cs +++ b/Assets/VRM/Tests/VrmDividedMeshTests.cs @@ -4,7 +4,6 @@ using System.Linq; using NUnit.Framework; using UniGLTF; using UnityEngine; -using VRMShaders; namespace VRM { diff --git a/Assets/VRM10/Editor/MeshUtility/Vrm10ExpressionUpdater.cs b/Assets/VRM10/Editor/MeshUtility/Vrm10ExpressionUpdater.cs index e4c1c6ff2..05f9ec3f9 100644 --- a/Assets/VRM10/Editor/MeshUtility/Vrm10ExpressionUpdater.cs +++ b/Assets/VRM10/Editor/MeshUtility/Vrm10ExpressionUpdater.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using UniGLTF; using UniGLTF.MeshUtility; using UnityEditor; using UnityEngine; @@ -71,7 +72,7 @@ namespace UniVRM10 } else { - if (VRMShaders.Symbols.VRM_DEVELOP) + if (Symbols.VRM_DEVELOP) { Debug.Log($"{val} >> {binding}"); } diff --git a/Assets/VRM10/Editor/ScriptedImporter/RemapEditorVrm.cs b/Assets/VRM10/Editor/ScriptedImporter/RemapEditorVrm.cs index 9093b11b8..ed2282d2c 100644 --- a/Assets/VRM10/Editor/ScriptedImporter/RemapEditorVrm.cs +++ b/Assets/VRM10/Editor/ScriptedImporter/RemapEditorVrm.cs @@ -2,8 +2,8 @@ using UniGLTF; using UnityEngine; using System.Linq; using UnityEditor; -using VRMShaders; using System.Collections.Generic; + #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; #else diff --git a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs index cf7d530c5..3458155ff 100644 --- a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs +++ b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs @@ -5,7 +5,7 @@ using System.IO; using UniGLTF.MeshUtility; using System.Linq; using System.Collections.Generic; -using VRMShaders; + #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; #else @@ -138,7 +138,7 @@ namespace UniVRM10 { EditorGUILayout.HelpBox(m_migration.Message, m_model != null ? MessageType.Info : MessageType.Warning); - if (VRMShaders.Symbols.VRM_DEVELOP) + if (Symbols.VRM_DEVELOP) { if (GUILayout.Button("debug export")) { diff --git a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs index a7c56ffb5..32ef5d600 100644 --- a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs +++ b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs @@ -3,7 +3,7 @@ using UnityEngine; using UniGLTF; using System; using VRM10.Settings; -using VRMShaders; + #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; #else @@ -47,7 +47,7 @@ namespace UniVRM10 // settings TextureImporters foreach (var textureInfo in loader.TextureDescriptorGenerator.Get().GetEnumerable()) { - VRMShaders.TextureImporterConfigurator.Configure(textureInfo, loader.TextureFactory.ExternalTextures); + TextureImporterConfigurator.Configure(textureInfo, loader.TextureFactory.ExternalTextures); } var loaded = loader.Load(); diff --git a/Assets/VRM10/Editor/Vrm10ExportDialog.cs b/Assets/VRM10/Editor/Vrm10ExportDialog.cs index 5f0adc450..a88d000fe 100644 --- a/Assets/VRM10/Editor/Vrm10ExportDialog.cs +++ b/Assets/VRM10/Editor/Vrm10ExportDialog.cs @@ -6,8 +6,6 @@ using UniGLTF.M17N; using UniGLTF.MeshUtility; using UnityEditor; using UnityEngine; -using VrmLib; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Editor/Vrm10InstanceEditor.cs b/Assets/VRM10/Editor/Vrm10InstanceEditor.cs index accf5b4e6..4438327fe 100644 --- a/Assets/VRM10/Editor/Vrm10InstanceEditor.cs +++ b/Assets/VRM10/Editor/Vrm10InstanceEditor.cs @@ -127,7 +127,7 @@ namespace UniVRM10 return "Assets/vrm-1.0.assets"; } - if (VRMShaders.PathObject.TryGetFromAsset(instance, out var asset)) + if (PathObject.TryGetFromAsset(instance, out var asset)) { return (asset.Parent.Child(instance.name + ".asset")).UnityAssetPath; } diff --git a/Assets/VRM10/Runtime/Components/Expression/ExpressionKey.cs b/Assets/VRM10/Runtime/Components/Expression/ExpressionKey.cs index a31f0e8ff..1725c84bc 100644 --- a/Assets/VRM10/Runtime/Components/Expression/ExpressionKey.cs +++ b/Assets/VRM10/Runtime/Components/Expression/ExpressionKey.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using VRMShaders; +using UniGLTF; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10Object.cs b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10Object.cs index ec25ff42c..b0838f6c0 100644 --- a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10Object.cs +++ b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10Object.cs @@ -1,5 +1,5 @@ +using UniGLTF; using UnityEngine; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectFirstPerson.cs b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectFirstPerson.cs index 812264422..acb6ffd79 100644 --- a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectFirstPerson.cs +++ b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectFirstPerson.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using UniGLTF; using UniGLTF.MeshUtility; using UnityEngine; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/ExpressionExtensions.cs b/Assets/VRM10/Runtime/IO/ExpressionExtensions.cs index 189c60547..18bb973eb 100644 --- a/Assets/VRM10/Runtime/IO/ExpressionExtensions.cs +++ b/Assets/VRM10/Runtime/IO/ExpressionExtensions.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using UniGLTF; using UniGLTF.Extensions.VRMC_vrm; using UnityEngine; @@ -16,7 +17,7 @@ namespace UniVRM10 return new UniVRM10.MorphTargetBinding(relativePath, bind.Index.Value, bind.Weight.Value); } - public static UniVRM10.MaterialColorBinding? Build10(this MaterialColorBind bind, IReadOnlyList materials) + public static UniVRM10.MaterialColorBinding? Build10(this MaterialColorBind bind, IReadOnlyList materials) { var value = new Vector4(bind.TargetValue[0], bind.TargetValue[1], bind.TargetValue[2], bind.TargetValue[3]); var material = materials[bind.Material.Value].Asset; @@ -42,7 +43,7 @@ namespace UniVRM10 return binding; } - public static UniVRM10.MaterialUVBinding? Build10(this TextureTransformBind bind, IReadOnlyList materials) + public static UniVRM10.MaterialUVBinding? Build10(this TextureTransformBind bind, IReadOnlyList materials) { var material = materials[bind.Material.Value].Asset; diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs index 93b5ebc1d..d721e1fdb 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs @@ -2,9 +2,8 @@ using UniGLTF; using UniGLTF.Extensions.VRMC_materials_mtoon; using UnityEngine; -using VRMShaders; using VRMShaders.VRM10.MToon10.Runtime; -using ColorSpace = VRMShaders.ColorSpace; +using ColorSpace = UniGLTF.ColorSpace; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs index b7ba7a563..ae7368347 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs @@ -4,9 +4,8 @@ using System.Linq; using UniGLTF; using UniGLTF.Extensions.VRMC_materials_mtoon; using UnityEngine; -using VRMShaders; using VRMShaders.VRM10.MToon10.Runtime; -using ColorSpace = VRMShaders.ColorSpace; +using ColorSpace = UniGLTF.ColorSpace; using OutlineWidthMode = UniGLTF.Extensions.VRMC_materials_mtoon.OutlineWidthMode; namespace UniVRM10 diff --git a/Assets/VRM10/Runtime/IO/Vrm10Data.cs b/Assets/VRM10/Runtime/IO/Vrm10Data.cs index 5750ba1da..2ffae0c3c 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Data.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Data.cs @@ -92,7 +92,7 @@ namespace UniVRM10 } byte[] debugCopy = null; - if (VRMShaders.Symbols.VRM_DEVELOP) + if (Symbols.VRM_DEVELOP) { // load 時の右手左手座標変換でバッファが破壊的変更されるので、コピーを作っている debugCopy = migrated.Select(x => x).ToArray(); diff --git a/Assets/VRM10/Runtime/IO/Vrm10Importer.cs b/Assets/VRM10/Runtime/IO/Vrm10Importer.cs index 352e8807d..c8638c52b 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Importer.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Importer.cs @@ -5,8 +5,6 @@ using System.Threading.Tasks; using UniGLTF; using UniGLTF.Utils; using UnityEngine; -using VRMShaders; - namespace UniVRM10 { @@ -350,7 +348,7 @@ namespace UniVRM10 awaitCaller = new ImmediateCaller(); } - if (Vrm10TextureDescriptorGenerator.TryGetMetaThumbnailTextureImportParam(Data, m_vrm.VrmExtension, out (SubAssetKey, VRMShaders.TextureDescriptor Param) kv)) + if (Vrm10TextureDescriptorGenerator.TryGetMetaThumbnailTextureImportParam(Data, m_vrm.VrmExtension, out (SubAssetKey, TextureDescriptor Param) kv)) { var texture = await TextureFactory.GetTextureAsync(kv.Param, awaitCaller); return texture as Texture2D; diff --git a/Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs b/Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs index cafb06db5..6e8e59cf5 100644 --- a/Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs +++ b/Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using UniGLTF; using UniHumanoid; using UnityEngine; @@ -83,7 +84,7 @@ namespace UniVRM10 var task = VRM10ObjectFirstPerson.CreateErasedMeshAsync( smr, firstPersonBone, - new VRMShaders.ImmediateCaller()); + new ImmediateCaller()); task.Wait(); var mesh = task.Result; if (mesh != null) diff --git a/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs b/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs index 0dbf74997..c33a940f7 100644 --- a/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs +++ b/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs @@ -6,7 +6,7 @@ using UniJSON; using UnityEngine; using VRMShaders.VRM10.MToon10.Runtime; using VRMShaders.VRM10.MToon10.Runtime.MToon0X; -using ColorSpace = VRMShaders.ColorSpace; +using ColorSpace = UniGLTF.ColorSpace; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/Migration/Materials/MigrationPbrMaterial.cs b/Assets/VRM10/Runtime/Migration/Materials/MigrationPbrMaterial.cs index 350eec06f..21f6acd54 100644 --- a/Assets/VRM10/Runtime/Migration/Materials/MigrationPbrMaterial.cs +++ b/Assets/VRM10/Runtime/Migration/Materials/MigrationPbrMaterial.cs @@ -3,7 +3,7 @@ using System.Linq; using UniGLTF; using UniJSON; using UnityEngine; -using ColorSpace = VRMShaders.ColorSpace; +using ColorSpace = UniGLTF.ColorSpace; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs b/Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs index 25d0d62b2..cb630d88e 100644 --- a/Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs +++ b/Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs @@ -5,7 +5,7 @@ using UniJSON; using UnityEngine; using VRMShaders; using VRMShaders.VRM10.MToon10.Runtime.MToon0X; -using ColorSpace = VRMShaders.ColorSpace; +using ColorSpace = UniGLTF.ColorSpace; namespace UniVRM10 { diff --git a/Assets/VRM10/Tests/ApiSampleTests.cs b/Assets/VRM10/Tests/ApiSampleTests.cs index a53b0dfdb..326a2eee3 100644 --- a/Assets/VRM10/Tests/ApiSampleTests.cs +++ b/Assets/VRM10/Tests/ApiSampleTests.cs @@ -1,9 +1,7 @@ using System.IO; using NUnit.Framework; using UniGLTF; -using UniGLTF.Extensions.VRMC_vrm; using UnityEngine; -using VRMShaders; namespace UniVRM10.Test { diff --git a/Assets/VRM10/Tests/LoadTests.cs b/Assets/VRM10/Tests/LoadTests.cs index 652e5a146..02e1deee2 100644 --- a/Assets/VRM10/Tests/LoadTests.cs +++ b/Assets/VRM10/Tests/LoadTests.cs @@ -21,7 +21,7 @@ namespace UniVRM10.Test using (var loader = new Vrm10Importer(vrm1Data)) { - loader.LoadAsync(new VRMShaders.ImmediateCaller()).Wait(); + loader.LoadAsync(new ImmediateCaller()).Wait(); } } } diff --git a/Assets/VRM10/Tests/MaterialImportTests.cs b/Assets/VRM10/Tests/MaterialImportTests.cs index a1737c3c4..019c6e33b 100644 --- a/Assets/VRM10/Tests/MaterialImportTests.cs +++ b/Assets/VRM10/Tests/MaterialImportTests.cs @@ -3,7 +3,6 @@ using System.Linq; using NUnit.Framework; using UniGLTF; using UnityEngine; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Tests/MigrationTests.cs b/Assets/VRM10/Tests/MigrationTests.cs index fab6ee3c2..09add1b02 100644 --- a/Assets/VRM10/Tests/MigrationTests.cs +++ b/Assets/VRM10/Tests/MigrationTests.cs @@ -4,9 +4,7 @@ using UnityEngine; using UniJSON; using System; using UniGLTF; -using System.Runtime.InteropServices; using System.Collections.Generic; -using VRMShaders; namespace UniVRM10 { @@ -292,7 +290,7 @@ namespace UniVRM10 [Test] public void GltfValidator() { - if (!VRMShaders.PathObject.TryGetFromEnvironmentVariable("GLTF_VALIDATOR", out var exe)) + if (!PathObject.TryGetFromEnvironmentVariable("GLTF_VALIDATOR", out var exe)) { return; } diff --git a/Assets/VRM10/Tests/Vrm10ApiTests.cs b/Assets/VRM10/Tests/Vrm10ApiTests.cs index d29dcd45c..07e189ad7 100644 --- a/Assets/VRM10/Tests/Vrm10ApiTests.cs +++ b/Assets/VRM10/Tests/Vrm10ApiTests.cs @@ -1,5 +1,5 @@ using NUnit.Framework; -using VRMShaders; +using UniGLTF; namespace UniVRM10.Test { diff --git a/Assets/VRM10_Samples/SimpleVrma/SimpleVrma.cs b/Assets/VRM10_Samples/SimpleVrma/SimpleVrma.cs index dc125a9b8..cc8c2f25b 100644 --- a/Assets/VRM10_Samples/SimpleVrma/SimpleVrma.cs +++ b/Assets/VRM10_Samples/SimpleVrma/SimpleVrma.cs @@ -1,8 +1,7 @@ using UniGLTF; using UnityEngine; using UniVRM10; -using UniVRM10.VRM10Viewer; -using VRMShaders; + #if UNITY_EDITOR using UnityEditor; #endif diff --git a/Assets/VRM10_Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs b/Assets/VRM10_Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs index f5b9328fc..d0b498891 100644 --- a/Assets/VRM10_Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs +++ b/Assets/VRM10_Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs @@ -69,7 +69,7 @@ namespace UniVRM10.FirstPersonSample return; } - var instance = await LoadAsync(path, new VRMShaders.RuntimeOnlyAwaitCaller()); + var instance = await LoadAsync(path, new RuntimeOnlyAwaitCaller()); var root = instance.gameObject; root.transform.SetParent(transform, false); @@ -84,7 +84,7 @@ namespace UniVRM10.FirstPersonSample SetupTarget(m_target); } - async Task LoadAsync(string path, VRMShaders.IAwaitCaller awaitCaller) + async Task LoadAsync(string path, IAwaitCaller awaitCaller) { var instance = await Vrm10.LoadPathAsync(path, awaitCaller: awaitCaller, showMeshes: false); diff --git a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs index f0f842ae2..1a63407ee 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs +++ b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs @@ -5,7 +5,6 @@ using System.Threading; using UniGLTF; using UnityEngine; using UnityEngine.UI; -using VRMShaders; namespace UniVRM10.VRM10Viewer { diff --git a/Assets/VRM_0x_and_10_Samples/MigrateExporter/MigrateExporter.cs b/Assets/VRM_0x_and_10_Samples/MigrateExporter/MigrateExporter.cs index 90491a140..8ba66d014 100644 --- a/Assets/VRM_0x_and_10_Samples/MigrateExporter/MigrateExporter.cs +++ b/Assets/VRM_0x_and_10_Samples/MigrateExporter/MigrateExporter.cs @@ -1,4 +1,5 @@ using System.IO; +using UniGLTF; using UnityEngine; namespace UniVRM10.Sample @@ -47,7 +48,7 @@ namespace UniVRM10.Sample }; // export vrm0 var vrm0 = VRM.VRMExporter.Export(exportConfig, - vrm0Instance.gameObject, new VRMShaders.RuntimeTextureSerializer()); + vrm0Instance.gameObject, new RuntimeTextureSerializer()); var vrm0bytes = vrm0.ToGlbBytes(); // migrate to vrm1 @@ -55,7 +56,7 @@ namespace UniVRM10.Sample { gltf.asset.generator = "MigrateExporter sample"; }); - var pathObj = VRMShaders.PathObject.FromFullPath(path); + var pathObj = PathObject.FromFullPath(path); var newPath = pathObj.Parent.Child(pathObj.Stem + ".10.vrm"); newPath.WriteAllBytes(vrm1Bytes); Debug.Log($"export to: {newPath}"); diff --git a/Assets/VRM_Samples/FirstPersonSample/VRMRuntimeLoader.cs b/Assets/VRM_Samples/FirstPersonSample/VRMRuntimeLoader.cs index 3e19933bc..8ca9f94e0 100644 --- a/Assets/VRM_Samples/FirstPersonSample/VRMRuntimeLoader.cs +++ b/Assets/VRM_Samples/FirstPersonSample/VRMRuntimeLoader.cs @@ -3,7 +3,6 @@ using System.IO; using UniGLTF; using UnityEngine; - namespace VRM.FirstPersonSample { public class VRMRuntimeLoader : MonoBehaviour @@ -114,7 +113,7 @@ namespace VRM.FirstPersonSample var loaded = default(RuntimeGltfInstance); if (m_loadAsync) { - loaded = await context.LoadAsync(new VRMShaders.RuntimeOnlyAwaitCaller()); + loaded = await context.LoadAsync(new RuntimeOnlyAwaitCaller()); } else { diff --git a/Assets/VRM_Samples/RuntimeExporterSample/VRMRuntimeExporter.cs b/Assets/VRM_Samples/RuntimeExporterSample/VRMRuntimeExporter.cs index 7eaf769bc..5744a3b55 100644 --- a/Assets/VRM_Samples/RuntimeExporterSample/VRMRuntimeExporter.cs +++ b/Assets/VRM_Samples/RuntimeExporterSample/VRMRuntimeExporter.cs @@ -1,7 +1,6 @@ using System.IO; +using UniGLTF; using UnityEngine; -using VRMShaders; - namespace VRM.RuntimeExporterSample { diff --git a/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs b/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs index d227bf369..1093736e7 100644 --- a/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs +++ b/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs @@ -7,8 +7,6 @@ using UniGLTF; using UniHumanoid; using UnityEngine; using UnityEngine.UI; -using VRMShaders; - namespace VRM.SimpleViewer { From 2778a696f152ecdec6389218e04e52d0908a8795 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Tue, 23 Jul 2024 20:02:47 +0900 Subject: [PATCH 9/9] remove unused usings --- .../Components/Expression/Preview/PreviewSceneManager.cs | 1 - .../Components/VrmAnimationInstance/Vrm10PoseLoader.cs | 2 -- .../BuiltInRP/Export/BuiltInVrm10MaterialExporter.cs | 1 - .../Import/BuiltInVrm10MaterialDescriptorGenerator.cs | 1 - .../URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs | 1 - .../URP/Import/UrpVrm10MaterialDescriptorGenerator.cs | 1 - .../VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs | 1 - .../Runtime/IO/Texture/Vrm10TextureDescriptorGenerator.cs | 6 +----- Assets/VRM10/Runtime/IO/Vrm10.cs | 2 -- Assets/VRM10/Runtime/IO/Vrm10Exporter.cs | 2 -- Assets/VRM10/Runtime/IO/VrmAnimationExporter.cs | 3 --- Assets/VRM10/Runtime/IO/VrmAnimationImporter.cs | 2 -- .../VRM10RuntimeExporterSample/VRM10RuntimeExporter.cs | 1 - 13 files changed, 1 insertion(+), 23 deletions(-) diff --git a/Assets/VRM10/Runtime/Components/Expression/Preview/PreviewSceneManager.cs b/Assets/VRM10/Runtime/Components/Expression/Preview/PreviewSceneManager.cs index bf222816a..a92c35f92 100644 --- a/Assets/VRM10/Runtime/Components/Expression/Preview/PreviewSceneManager.cs +++ b/Assets/VRM10/Runtime/Components/Expression/Preview/PreviewSceneManager.cs @@ -2,7 +2,6 @@ using System.Linq; using UnityEngine; using System; -using VRMShaders; using UniGLTF; diff --git a/Assets/VRM10/Runtime/Components/VrmAnimationInstance/Vrm10PoseLoader.cs b/Assets/VRM10/Runtime/Components/VrmAnimationInstance/Vrm10PoseLoader.cs index 2750d5271..141a6d892 100644 --- a/Assets/VRM10/Runtime/Components/VrmAnimationInstance/Vrm10PoseLoader.cs +++ b/Assets/VRM10/Runtime/Components/VrmAnimationInstance/Vrm10PoseLoader.cs @@ -1,10 +1,8 @@ -using System; using System.Collections.Generic; using System.Threading.Tasks; using UniGLTF; using UniJSON; using UnityEngine; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/BuiltInVrm10MaterialExporter.cs b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/BuiltInVrm10MaterialExporter.cs index 9f24619d8..fb0d3ac0e 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/BuiltInVrm10MaterialExporter.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/BuiltInVrm10MaterialExporter.cs @@ -1,6 +1,5 @@ using UniGLTF; using UnityEngine; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs index 4e947844b..ec6b09115 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using UniGLTF; using UnityEngine; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/Material/URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs b/Assets/VRM10/Runtime/IO/Material/URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs index 9fd485809..0c5696704 100644 --- a/Assets/VRM10/Runtime/IO/Material/URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs +++ b/Assets/VRM10/Runtime/IO/Material/URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs @@ -3,7 +3,6 @@ using System.Linq; using UniGLTF; using UnityEngine; using VRM10.MToon10; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs b/Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs index d389d3117..b0cf9d20b 100644 --- a/Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs +++ b/Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using UniGLTF; using UnityEngine; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs b/Assets/VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs index fe9dac249..28d78c174 100644 --- a/Assets/VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs +++ b/Assets/VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs @@ -4,7 +4,6 @@ using UniGLTF; using UniGLTF.Extensions.VRMC_materials_mtoon; using UnityEngine; using VRM10.MToon10; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureDescriptorGenerator.cs b/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureDescriptorGenerator.cs index 7a6db9e79..ed7ea65c0 100644 --- a/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureDescriptorGenerator.cs +++ b/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureDescriptorGenerator.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; using UniGLTF; -using UnityEngine; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/Vrm10.cs b/Assets/VRM10/Runtime/IO/Vrm10.cs index fc636e5c5..9eeaf41a1 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10.cs @@ -1,11 +1,9 @@ using System; -using System.Collections.Generic; using System.IO; using System.Threading; using System.Threading.Tasks; using UniGLTF; using UnityEngine; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs index 95d68cddc..f29306031 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs @@ -4,8 +4,6 @@ using System.Linq; using UniGLTF; using UnityEngine; using VrmLib; -using VRMShaders; - namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/VrmAnimationExporter.cs b/Assets/VRM10/Runtime/IO/VrmAnimationExporter.cs index 864dd9a5f..4cda49aa5 100644 --- a/Assets/VRM10/Runtime/IO/VrmAnimationExporter.cs +++ b/Assets/VRM10/Runtime/IO/VrmAnimationExporter.cs @@ -1,11 +1,8 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; using UniGLTF; -using UniHumanoid; using UnityEngine; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/VrmAnimationImporter.cs b/Assets/VRM10/Runtime/IO/VrmAnimationImporter.cs index 7150476bf..5eea64aac 100644 --- a/Assets/VRM10/Runtime/IO/VrmAnimationImporter.cs +++ b/Assets/VRM10/Runtime/IO/VrmAnimationImporter.cs @@ -7,8 +7,6 @@ using UniGLTF.Extensions.VRMC_vrm_animation; using UniHumanoid; using UniJSON; using UnityEngine; -using UniVRM10; -using VRMShaders; namespace UniVRM10 { diff --git a/Assets/VRM10_Samples/VRM10RuntimeExporterSample/VRM10RuntimeExporter.cs b/Assets/VRM10_Samples/VRM10RuntimeExporterSample/VRM10RuntimeExporter.cs index 679e49ede..76c5ebc2c 100644 --- a/Assets/VRM10_Samples/VRM10RuntimeExporterSample/VRM10RuntimeExporter.cs +++ b/Assets/VRM10_Samples/VRM10RuntimeExporterSample/VRM10RuntimeExporter.cs @@ -1,7 +1,6 @@ using System.IO; using UniGLTF; using UnityEngine; -using VRMShaders; namespace UniVRM10.RuntimeExporterSample {