Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-06-02 22:14:30 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

remove CustomerEqualityComparer

Browse Source
This commit is contained in:
ousttrue 2018-04-03 20:24:17 +09:00
parent 8fb64eb6cd
commit c8228ed2f8
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Scripts/BlendShape/BlendShapeKey.cs
View File

@ -1,5 +1,5 @@
using System; using System;
using System.Collections.Generic;
namespace VRM namespace VRM
{ {
@ -58,29 +58,24 @@ namespace VRM
public bool Equals(BlendShapeKey other) public bool Equals(BlendShapeKey other)
{ {
/*
if (Preset != BlendShapePreset.Unknown && Preset == other.Preset)
{
// Unknown以外のPresetが一致したら一致とみなす
return true;
}
// .ToUpper()済み
return Name == other.Name;
*/
return ID == other.ID; return ID == other.ID;
} }
public class CustomerEqualityComparer : IEqualityComparer<BlendShapeKey> public override bool Equals(object obj)
{ {
public bool Equals(BlendShapeKey x, BlendShapeKey y) if (obj is BlendShapeKey)
{ {
return x.Equals(y); return Equals((BlendShapeKey)obj);
} }
else
{
return false;
}
}
public int GetHashCode(BlendShapeKey obj) public override int GetHashCode()
{ {
return obj.ToString().GetHashCode(); return ID.GetHashCode();
}
} }
public static BlendShapeKey CreateFrom(BlendShapeClip clip) public static BlendShapeKey CreateFrom(BlendShapeClip clip)

4
Scripts/BlendShape/VRMBlendShapeProxy.cs
View File

@ -65,8 +65,8 @@ namespace VRM
public BlendShapeMerger(IEnumerable<BlendShapeClip> clips, Transform root) public BlendShapeMerger(IEnumerable<BlendShapeClip> clips, Transform root)
{ {
m_clipMap = clips.ToDictionary(x => BlendShapeKey.CreateFrom(x), x => x, new BlendShapeKey.CustomerEqualityComparer()); m_clipMap = clips.ToDictionary(x => BlendShapeKey.CreateFrom(x), x => x);
m_valueMap = new Dictionary<BlendShapeKey, float>(new BlendShapeKey.CustomerEqualityComparer()); m_valueMap = new Dictionary<BlendShapeKey, float>();
foreach (var kv in m_clipMap) foreach (var kv in m_clipMap)
{ {
foreach (var binding in kv.Value.Values) { foreach (var binding in kv.Value.Values) {

2
Scripts/Editor/Tests/VRMBlendShapeKeyTest.cs
View File

@ -14,7 +14,7 @@ public class VRMBlendShapeKeyTest
Assert.AreEqual(key, new BlendShapeKey(BlendShapePreset.Blink)); Assert.AreEqual(key, new BlendShapeKey(BlendShapePreset.Blink));
Assert.AreEqual(key, new BlendShapeKey("xxx", BlendShapePreset.Blink)); Assert.AreEqual(key, new BlendShapeKey("xxx", BlendShapePreset.Blink));
var dict = new Dictionary<BlendShapeKey, float>(new BlendShapeKey.CustomerEqualityComparer()); var dict = new Dictionary<BlendShapeKey, float>();
dict[new BlendShapeKey("xxx", BlendShapePreset.Blink)] = 1.0f; dict[new BlendShapeKey("xxx", BlendShapePreset.Blink)] = 1.0f;
Assert.IsTrue(dict.ContainsKey(new BlendShapeKey("blink"))); Assert.IsTrue(dict.ContainsKey(new BlendShapeKey("blink")));