From cec296af9c40de13569f800f4168cc06325d4ec0 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 24 Mar 2021 16:23:21 +0900 Subject: [PATCH] SamplerWrapTypes --- .../UniGLTF/IO/TextureIO/TextureFactory.cs | 36 +++++++++---------- Assets/VRMShaders/Runtime/GetTextureParam.cs | 10 +----- Assets/VRMShaders/Runtime/SamplerWrapTypes.cs | 10 ++++++ .../Runtime/SamplerWrapTypes.cs.meta | 11 ++++++ 4 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 Assets/VRMShaders/Runtime/SamplerWrapTypes.cs create mode 100644 Assets/VRMShaders/Runtime/SamplerWrapTypes.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureFactory.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureFactory.cs index 87dd7a26b..7a7738576 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureFactory.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureFactory.cs @@ -191,19 +191,19 @@ namespace UniGLTF { switch (key) { - case GetTextureParam.TextureWrapType.All: + case SamplerWrapType.All: texture.wrapMode = value; break; - case GetTextureParam.TextureWrapType.U: + case SamplerWrapType.U: texture.wrapModeU = value; break; - case GetTextureParam.TextureWrapType.V: + case SamplerWrapType.V: texture.wrapModeV = value; break; - case GetTextureParam.TextureWrapType.W: + case SamplerWrapType.W: texture.wrapModeW = value; break; @@ -358,7 +358,7 @@ namespace UniGLTF return new GetTextureParam.TextureSamplerParam { FilterMode = FilterMode.Bilinear, - WrapModes = new (GetTextureParam.TextureWrapType, TextureWrapMode)[] { }, + WrapModes = new (SamplerWrapType, TextureWrapMode)[] { }, }; } @@ -370,26 +370,26 @@ namespace UniGLTF }; } - public static IEnumerable<(GetTextureParam.TextureWrapType, TextureWrapMode)> GetUnityWrapMode(glTFTextureSampler sampler) + public static IEnumerable<(SamplerWrapType, TextureWrapMode)> GetUnityWrapMode(glTFTextureSampler sampler) { if (sampler.wrapS == sampler.wrapT) { switch (sampler.wrapS) { case glWrap.NONE: // default - yield return (GetTextureParam.TextureWrapType.All, TextureWrapMode.Repeat); + yield return (SamplerWrapType.All, TextureWrapMode.Repeat); break; case glWrap.CLAMP_TO_EDGE: - yield return (GetTextureParam.TextureWrapType.All, TextureWrapMode.Clamp); + yield return (SamplerWrapType.All, TextureWrapMode.Clamp); break; case glWrap.REPEAT: - yield return (GetTextureParam.TextureWrapType.All, TextureWrapMode.Repeat); + yield return (SamplerWrapType.All, TextureWrapMode.Repeat); break; case glWrap.MIRRORED_REPEAT: - yield return (GetTextureParam.TextureWrapType.All, TextureWrapMode.Mirror); + yield return (SamplerWrapType.All, TextureWrapMode.Mirror); break; default: @@ -401,19 +401,19 @@ namespace UniGLTF switch (sampler.wrapS) { case glWrap.NONE: // default - yield return (GetTextureParam.TextureWrapType.U, TextureWrapMode.Repeat); + yield return (SamplerWrapType.U, TextureWrapMode.Repeat); break; case glWrap.CLAMP_TO_EDGE: - yield return (GetTextureParam.TextureWrapType.U, TextureWrapMode.Clamp); + yield return (SamplerWrapType.U, TextureWrapMode.Clamp); break; case glWrap.REPEAT: - yield return (GetTextureParam.TextureWrapType.U, TextureWrapMode.Repeat); + yield return (SamplerWrapType.U, TextureWrapMode.Repeat); break; case glWrap.MIRRORED_REPEAT: - yield return (GetTextureParam.TextureWrapType.U, TextureWrapMode.Mirror); + yield return (SamplerWrapType.U, TextureWrapMode.Mirror); break; default: @@ -422,19 +422,19 @@ namespace UniGLTF switch (sampler.wrapT) { case glWrap.NONE: // default - yield return (GetTextureParam.TextureWrapType.V, TextureWrapMode.Repeat); + yield return (SamplerWrapType.V, TextureWrapMode.Repeat); break; case glWrap.CLAMP_TO_EDGE: - yield return (GetTextureParam.TextureWrapType.V, TextureWrapMode.Clamp); + yield return (SamplerWrapType.V, TextureWrapMode.Clamp); break; case glWrap.REPEAT: - yield return (GetTextureParam.TextureWrapType.V, TextureWrapMode.Repeat); + yield return (SamplerWrapType.V, TextureWrapMode.Repeat); break; case glWrap.MIRRORED_REPEAT: - yield return (GetTextureParam.TextureWrapType.V, TextureWrapMode.Mirror); + yield return (SamplerWrapType.V, TextureWrapMode.Mirror); break; default: diff --git a/Assets/VRMShaders/Runtime/GetTextureParam.cs b/Assets/VRMShaders/Runtime/GetTextureParam.cs index bdfc7847d..9f1a4314b 100644 --- a/Assets/VRMShaders/Runtime/GetTextureParam.cs +++ b/Assets/VRMShaders/Runtime/GetTextureParam.cs @@ -73,17 +73,9 @@ namespace VRMShaders public string ConvertedFileName => Name.ConvertedFileName; public string Uri => Name.Uri; - public enum TextureWrapType - { - All, - U, - V, - W, - } - public struct TextureSamplerParam { - public (TextureWrapType, TextureWrapMode)[] WrapModes; + public (SamplerWrapType, TextureWrapMode)[] WrapModes; public FilterMode FilterMode; } diff --git a/Assets/VRMShaders/Runtime/SamplerWrapTypes.cs b/Assets/VRMShaders/Runtime/SamplerWrapTypes.cs new file mode 100644 index 000000000..cb47b57e5 --- /dev/null +++ b/Assets/VRMShaders/Runtime/SamplerWrapTypes.cs @@ -0,0 +1,10 @@ +namespace VRMShaders +{ + public enum SamplerWrapType + { + All, + U, + V, + W, + } +} \ No newline at end of file diff --git a/Assets/VRMShaders/Runtime/SamplerWrapTypes.cs.meta b/Assets/VRMShaders/Runtime/SamplerWrapTypes.cs.meta new file mode 100644 index 000000000..f40105f81 --- /dev/null +++ b/Assets/VRMShaders/Runtime/SamplerWrapTypes.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0e15e75e4b0c0c24999dcdee7dc17002 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: