From f5d40b4d850dd091212cffdea855dd87679cc562 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Mon, 29 Jul 2024 21:59:14 +0900 Subject: [PATCH] Refactor about detecting the RenderPipeline --- .../MaterialDescriptorGeneratorUtility.cs | 16 ++++++++++++++++ .../MaterialDescriptorGeneratorUtility.cs.meta} | 0 ...iptorUtility.cs => RenderPipelineUtility.cs} | 17 +++-------------- .../IO/MaterialIO/RenderPipelineUtility.cs.meta | 3 +++ ...=> VrmMaterialDescriptorGeneratorUtility.cs} | 2 +- ...mMaterialDescriptorGeneratorUtility.cs.meta} | 0 ...rialDescriptorGeneratorDescriptorUtility.cs} | 2 +- ...escriptorGeneratorDescriptorUtility.cs.meta} | 0 8 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptorGeneratorUtility.cs rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{RenderPipelineMaterialDescriptorUtility.cs.meta => Import/MaterialDescriptorGeneratorUtility.cs.meta} (100%) rename Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/{RenderPipelineMaterialDescriptorUtility.cs => RenderPipelineUtility.cs} (57%) create mode 100644 Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineUtility.cs.meta rename Assets/VRM/Runtime/IO/MaterialIO/{VRMRenderPipelineMaterialDescriptorGeneratorUtility.cs => VrmMaterialDescriptorGeneratorUtility.cs} (86%) rename Assets/VRM/Runtime/IO/MaterialIO/{VRMRenderPipelineMaterialDescriptorGeneratorUtility.cs.meta => VrmMaterialDescriptorGeneratorUtility.cs.meta} (100%) rename Assets/VRM10/Runtime/IO/Material/URP/Import/{VRM10RenderPipelineMaterialDescriptorGeneratorUtility.cs => Vrm10MaterialDescriptorGeneratorDescriptorUtility.cs} (86%) rename Assets/VRM10/Runtime/IO/Material/URP/Import/{VRM10RenderPipelineMaterialDescriptorGeneratorUtility.cs.meta => Vrm10MaterialDescriptorGeneratorDescriptorUtility.cs.meta} (100%) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptorGeneratorUtility.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptorGeneratorUtility.cs new file mode 100644 index 000000000..dee8cba3d --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptorGeneratorUtility.cs @@ -0,0 +1,16 @@ +namespace UniGLTF +{ + public static class MaterialDescriptorGeneratorUtility + { + public static IMaterialDescriptorGenerator GetValidGltfMaterialDescriptorGenerator() + { + return RenderPipelineUtility.GetRenderPipelineType() switch + { + RenderPipelineTypes.UniversalRenderPipeline => new UrpGltfMaterialDescriptorGenerator(), + RenderPipelineTypes.BuiltinRenderPipeline => new BuiltInGltfMaterialDescriptorGenerator(), + _ => new BuiltInGltfMaterialDescriptorGenerator(), + }; + } + } +} + diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineMaterialDescriptorUtility.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptorGeneratorUtility.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineMaterialDescriptorUtility.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptorGeneratorUtility.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineMaterialDescriptorUtility.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineUtility.cs similarity index 57% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineMaterialDescriptorUtility.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineUtility.cs index 927e6f6e6..76ecc0547 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineMaterialDescriptorUtility.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineUtility.cs @@ -1,8 +1,8 @@ -using UnityEngine.Rendering; +using UnityEngine.Rendering; namespace UniGLTF { - public static class MaterialDescriptorGeneratorUtility + public static class RenderPipelineUtility { public static RenderPipelineTypes GetRenderPipelineType() { @@ -25,16 +25,5 @@ namespace UniGLTF return RenderPipelineTypes.Unknown; } - - public static IMaterialDescriptorGenerator GetValidGltfMaterialDescriptorGenerator() - { - return GetRenderPipelineType() switch - { - RenderPipelineTypes.UniversalRenderPipeline => new UrpGltfMaterialDescriptorGenerator(), - RenderPipelineTypes.BuiltinRenderPipeline => new BuiltInGltfMaterialDescriptorGenerator(), - _ => new BuiltInGltfMaterialDescriptorGenerator(), - }; - } } -} - +} \ No newline at end of file diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineUtility.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineUtility.cs.meta new file mode 100644 index 000000000..2f54eddfe --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/RenderPipelineUtility.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0fd29db9c49145cd9f56f92e6153c8db +timeCreated: 1722257774 \ No newline at end of file diff --git a/Assets/VRM/Runtime/IO/MaterialIO/VRMRenderPipelineMaterialDescriptorGeneratorUtility.cs b/Assets/VRM/Runtime/IO/MaterialIO/VrmMaterialDescriptorGeneratorUtility.cs similarity index 86% rename from Assets/VRM/Runtime/IO/MaterialIO/VRMRenderPipelineMaterialDescriptorGeneratorUtility.cs rename to Assets/VRM/Runtime/IO/MaterialIO/VrmMaterialDescriptorGeneratorUtility.cs index 282e4d8c3..f13e9e92a 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/VRMRenderPipelineMaterialDescriptorGeneratorUtility.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/VrmMaterialDescriptorGeneratorUtility.cs @@ -6,7 +6,7 @@ namespace VRM { public static IMaterialDescriptorGenerator GetValidVrmMaterialDescriptorGenerator(glTF_VRM_extensions vrm) { - return MaterialDescriptorGeneratorUtility.GetRenderPipelineType() switch + return RenderPipelineUtility.GetRenderPipelineType() switch { RenderPipelineTypes.UniversalRenderPipeline => new UrpVrmMaterialDescriptorGenerator(vrm), RenderPipelineTypes.BuiltinRenderPipeline => new BuiltInVrmMaterialDescriptorGenerator(vrm), diff --git a/Assets/VRM/Runtime/IO/MaterialIO/VRMRenderPipelineMaterialDescriptorGeneratorUtility.cs.meta b/Assets/VRM/Runtime/IO/MaterialIO/VrmMaterialDescriptorGeneratorUtility.cs.meta similarity index 100% rename from Assets/VRM/Runtime/IO/MaterialIO/VRMRenderPipelineMaterialDescriptorGeneratorUtility.cs.meta rename to Assets/VRM/Runtime/IO/MaterialIO/VrmMaterialDescriptorGeneratorUtility.cs.meta diff --git a/Assets/VRM10/Runtime/IO/Material/URP/Import/VRM10RenderPipelineMaterialDescriptorGeneratorUtility.cs b/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10MaterialDescriptorGeneratorDescriptorUtility.cs similarity index 86% rename from Assets/VRM10/Runtime/IO/Material/URP/Import/VRM10RenderPipelineMaterialDescriptorGeneratorUtility.cs rename to Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10MaterialDescriptorGeneratorDescriptorUtility.cs index 9bd072165..bb3000f29 100644 --- a/Assets/VRM10/Runtime/IO/Material/URP/Import/VRM10RenderPipelineMaterialDescriptorGeneratorUtility.cs +++ b/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10MaterialDescriptorGeneratorDescriptorUtility.cs @@ -6,7 +6,7 @@ namespace UniVRM10 { public static IMaterialDescriptorGenerator GetValidVrm10MaterialDescriptorGenerator() { - return MaterialDescriptorGeneratorUtility.GetRenderPipelineType() switch + return RenderPipelineUtility.GetRenderPipelineType() switch { RenderPipelineTypes.UniversalRenderPipeline => new UrpVrm10MaterialDescriptorGenerator(), RenderPipelineTypes.BuiltinRenderPipeline => new BuiltInVrm10MaterialDescriptorGenerator(), diff --git a/Assets/VRM10/Runtime/IO/Material/URP/Import/VRM10RenderPipelineMaterialDescriptorGeneratorUtility.cs.meta b/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10MaterialDescriptorGeneratorDescriptorUtility.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/URP/Import/VRM10RenderPipelineMaterialDescriptorGeneratorUtility.cs.meta rename to Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10MaterialDescriptorGeneratorDescriptorUtility.cs.meta