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

Merge pull request #945 from ousttrue/fix/magFilter

Browse Source 
fix MagFiler
This commit is contained in:
Masataka SUMI
2021-05-14 14:41:38 +09:00
committed by GitHub
parent db93e9390f d9f011dd9c
commit ef81a6502c
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExportUtil.cs
View File

@@ -33,6 +33,9 @@ namespace UniGLTF
public gltfMorphTarget ToGltf(glTF gltf, int bufferIndex, bool useNormal)
{
var positionAccessorIndex = gltf.ExtendBufferAndGetAccessorIndex(bufferIndex, m_positions.ToArray(), glBufferTarget.ARRAY_BUFFER);
gltf.accessors[positionAccessorIndex].min = m_positions.Aggregate(m_positions[0], (a, b) => new Vector3(Mathf.Min(a.x, b.x), Math.Min(a.y, b.y), Mathf.Min(a.z, b.z))).ToArray();
gltf.accessors[positionAccessorIndex].max = m_positions.Aggregate(m_positions[0], (a, b) => new Vector3(Mathf.Max(a.x, b.x), Math.Max(a.y, b.y), Mathf.Max(a.z, b.z))).ToArray();
var normalAccessorIndex = -1;
if (useNormal)
{

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

@@ -8,7 +8,24 @@ namespace UniGLTF
public static class TextureSamplerUtil
{
#region Export
public static glFilter ExportFilterMode(Texture texture)
// MagFilter は ２種類だけ
public static glFilter ExportMagFilter(Texture texture)
{
switch (texture.filterMode)
{
case FilterMode.Point:
return glFilter.NEAREST;
case FilterMode.Bilinear:
case FilterMode.Trilinear:
return glFilter.LINEAR;
default:
throw new NotImplementedException();
}
}
public static glFilter ExportMinFilter(Texture texture)
{
switch (texture.filterMode)
{
@@ -68,13 +85,14 @@ namespace UniGLTF
public static glTFTextureSampler Export(Texture texture)
{
var filter = ExportFilterMode(texture);
var magFilter = ExportMagFilter(texture);
var minFilter = ExportMinFilter(texture);
var wrapS = ExportWrapMode(GetWrapS(texture));
var wrapT = ExportWrapMode(GetWrapT(texture));
return new glTFTextureSampler
{
magFilter = filter,
minFilter = filter,
magFilter = magFilter,
minFilter = minFilter,
wrapS = wrapS,
wrapT = wrapT,
};