Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-14 23:10:46 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SamplerWrapTypes

Browse Source
This commit is contained in:
ousttrue
2021-03-24 16:23:21 +09:00
parent f89f1a26f1
commit cec296af9c
4 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureFactory.cs
View File

@@ -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:

10
Assets/VRMShaders/Runtime/GetTextureParam.cs
View File

@@ -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;
}

10
Assets/VRMShaders/Runtime/SamplerWrapTypes.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace VRMShaders
{
public enum SamplerWrapType
{
All,
U,
V,
W,
}
}

11
Assets/VRMShaders/Runtime/SamplerWrapTypes.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0e15e75e4b0c0c24999dcdee7dc17002
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: