Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-25 12:05:08 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

remove #if UNITY_2017_1_OR_NEWER

Browse Source
This commit is contained in:
ousttrue
2021-05-21 13:12:54 +09:00
parent 95cb9da77e
commit d4daa3951f
1 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureSamplerUtil.cs
View File

@@ -43,24 +43,6 @@ namespace UniGLTF
}
}
public static TextureWrapMode GetWrapS(Texture texture)
{
#if UNITY_2017_1_OR_NEWER
return texture.wrapModeU;
#else
return texture.wrapMode;
#endif
}
public static TextureWrapMode GetWrapT(Texture texture)
{
#if UNITY_2017_1_OR_NEWER
return texture.wrapModeV;
#else
return texture.wrapMode;
#endif
}
public static glWrap ExportWrapMode(TextureWrapMode wrapMode)
{
switch (wrapMode)
@@ -68,18 +50,14 @@ namespace UniGLTF
case TextureWrapMode.Clamp:
return glWrap.CLAMP_TO_EDGE;
case (TextureWrapMode)(-1):
case TextureWrapMode.Repeat:
return glWrap.REPEAT;
#if UNITY_2017_1_OR_NEWER
case TextureWrapMode.Mirror:
case TextureWrapMode.MirrorOnce:
return glWrap.MIRRORED_REPEAT;
#endif
// case (TextureWrapMode)(-1):
// case TextureWrapMode.Repeat:
default:
throw new NotImplementedException();
return glWrap.REPEAT;
}
}
@@ -87,8 +65,8 @@ namespace UniGLTF
{
var magFilter = ExportMagFilter(texture);
var minFilter = ExportMinFilter(texture);
var wrapS = ExportWrapMode(GetWrapS(texture));
var wrapT = ExportWrapMode(GetWrapT(texture));
var wrapS = ExportWrapMode(texture.wrapModeU);
var wrapT = ExportWrapMode(texture.wrapModeV);
return new glTFTextureSampler
{
magFilter = magFilter,