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

Merge pull request #1444 from ousttrue/fix/MaterialHasVertexColor

Browse Source 
Fix/material has vertex color
This commit is contained in:
ousttrue
2022-01-06 14:55:28 +09:00
committed by GitHub
parent 796ea8db23 c55d2cc851
commit 3516078eac
4 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Assets/UniGLTF/Runtime/UniGLTF/Format/glTF.cs
View File

@@ -81,36 +81,9 @@ namespace UniGLTF
}
}
public bool MaterialHasVertexColor(glTFMaterial material)
{
if (material == null)
{
return false;
}
var materialIndex = materials.IndexOf(material);
if (materialIndex == -1)
{
return false;
}
return MaterialHasVertexColor(materialIndex);
}
[JsonSchema(MinItems = 1, ExplicitIgnorableItemLength = 0)]
public List<glTFMesh> meshes = new List<glTFMesh>();
public bool MaterialHasVertexColor(int materialIndex)
{
if (materialIndex < 0 || materialIndex >= materials.Count)
{
return false;
}
var hasVertexColor = meshes.SelectMany(x => x.primitives).Any(x => x.material == materialIndex && x.HasVertexColor);
return hasVertexColor;
}
[JsonSchema(MinItems = 1, ExplicitIgnorableItemLength = 0)]
public List<glTFNode> nodes = new List<glTFNode>();

8
Assets/UniGLTF/Runtime/UniGLTF/Format/glTFMesh.cs
View File

@@ -84,14 +84,6 @@ namespace UniGLTF
[JsonSchema(Required = true, SkipSchemaComparison = true)]
public glTFAttributes attributes;
public bool HasVertexColor
{
get
{
return attributes.COLOR_0 != -1;
}
}
[JsonSchema(Minimum = 0)]
public int material;

44
Assets/UniGLTF/Runtime/UniGLTF/IO/GltfData.cs
View File

@@ -329,5 +329,49 @@ namespace UniGLTF
return (GetBytesFromUri(image.uri), image.mimeType);
}
}
// not black(0, 0, 0, 1)
static readonly UnityEngine.Color ZERO = new UnityEngine.Color(0, 0, 0, 0);
public bool HasVertexColor(glTFAttributes attributes)
{
if (attributes.COLOR_0 == -1)
{
return false;
}
var colors = GetArrayFromAccessor<UnityEngine.Color>(attributes.COLOR_0);
foreach (var color in colors)
{
if (color != ZERO)
{
return true;
}
}
// すべて (0, 0, 0, 0) だった。使っていないと見做す。
return false;
}
public bool MaterialHasVertexColor(int materialIndex)
{
if (materialIndex < 0 || materialIndex >= GLTF.materials.Count)
{
// index out of range. material not exists
return false;
}
foreach (var mesh in GLTF.meshes)
{
foreach (var prim in mesh.primitives)
{
if (prim.material == materialIndex && HasVertexColor(prim.attributes))
{
return true;
}
}
}
return false;
}
}
}

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterialImporter.cs
View File

@@ -91,7 +91,7 @@ namespace UniGLTF
}
// VColor
var hasVertexColor = data.GLTF.MaterialHasVertexColor(i);
var hasVertexColor = data.MaterialHasVertexColor(i);
if (hasVertexColor)
{
UniUnlitUtil.SetVColBlendMode(material, UniUnlitVertexColorBlendOp.Multiply);