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

Added MaterialValueBinding for _ST_S and _ST_T

Browse Source
This commit is contained in:
ousttrue 2018-07-26 15:17:24 +09:00
parent 2649cee958
commit a2bc24fe4a
2 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Scripts/BlendShape/BlendShapeMerger.cs
View File

@ -74,19 +74,48 @@ namespace VRM
}
}
foreach(var binding in kv.Value.MaterialValues)
foreach (var binding in kv.Value.MaterialValues)
{
if (!m_materialSetterMap.ContainsKey(binding))
{
Material target;
if(m_materialMap.TryGetValue(binding.MaterialName, out target))
if (m_materialMap.TryGetValue(binding.MaterialName, out target))
{
m_materialSetterMap.Add(binding, x =>
if (binding.ValueName.EndsWith("_ST_S"))
{
var valueName = binding.ValueName.Substring(0, binding.ValueName.Length - 2);
Action<float> setter = value =>
{
var propValue = binding.BaseValue + (binding.TargetValue - binding.BaseValue) * value;
var src = target.GetVector(valueName);
src.x = propValue.x; // horizontal only
src.z = propValue.z; // horizontal only
target.SetVector(valueName, src);
};
m_materialSetterMap.Add(binding, setter);
}
else if(binding.ValueName.EndsWith("_ST_T"))
{
var valueName = binding.ValueName.Substring(0, binding.ValueName.Length - 2);
Action<float> setter = value =>
{
var propValue = binding.BaseValue + (binding.TargetValue - binding.BaseValue) * value;
var src = target.GetVector(valueName);
src.y = propValue.y; // vertical only
src.w = propValue.w; // vertical only
target.SetVector(valueName, src);
};
m_materialSetterMap.Add(binding, setter);
}
else
{
Action<float> vec4Setter = x =>
{
//target.SetBlendShapeWeight(binding.Index, x);
var propValue = binding.BaseValue + (binding.TargetValue - binding.BaseValue) * x;
target.SetColor(binding.ValueName, propValue);
});
};
m_materialSetterMap.Add(binding, vec4Setter);
}
}
else
{
@ -111,17 +140,17 @@ namespace VRM
foreach (var kv in m_blendShapeValueMap)
{
Action<float> setter;
if(m_blendShapeSetterMap.TryGetValue(kv.Key, out setter))
if (m_blendShapeSetterMap.TryGetValue(kv.Key, out setter))
{
setter(kv.Value);
}
}
m_blendShapeValueMap.Clear();
foreach(var kv in m_materialValueMap)
foreach (var kv in m_materialValueMap)
{
Action<float> setter;
if(m_materialSetterMap.TryGetValue(kv.Key, out setter))
if (m_materialSetterMap.TryGetValue(kv.Key, out setter))
{
setter(kv.Value);
}
@ -131,7 +160,7 @@ namespace VRM
public void SetValues(IEnumerable<KeyValuePair<BlendShapeKey, float>> values)
{
foreach(var kv in values)
foreach (var kv in values)
{
SetValue(kv.Key, kv.Value, false);
}
@ -154,7 +183,7 @@ namespace VRM
{
// 値置き換え
Action<float> setter;
if(m_blendShapeSetterMap.TryGetValue(binding, out setter))
if (m_blendShapeSetterMap.TryGetValue(binding, out setter))
{
setter(binding.Weight * value);
}
@ -163,7 +192,7 @@ namespace VRM
{
// 積算
float acc;
if(m_blendShapeValueMap.TryGetValue(binding, out acc))
if (m_blendShapeValueMap.TryGetValue(binding, out acc))
{
m_blendShapeValueMap[binding] = acc + binding.Weight * value;
}

8
Scripts/LookAt/VRMLookAtBlendShapeApplyer.cs
View File

@ -45,27 +45,27 @@ namespace VRM
if (yaw < 0)
{
// Left
m_propxy.SetValue(BlendShapePreset.LookRight, 0); // clear first
m_propxy.SetValue(BlendShapePreset.LookLeft, Horizontal.Map(-yaw));
m_propxy.SetValue(BlendShapePreset.LookRight, 0);
}
else
{
// Right
m_propxy.SetValue(BlendShapePreset.LookLeft, 0);
m_propxy.SetValue(BlendShapePreset.LookLeft, 0); // clear first
m_propxy.SetValue(BlendShapePreset.LookRight, Horizontal.Map(yaw));
}
if (pitch < 0)
{
// Down
m_propxy.SetValue(BlendShapePreset.LookUp, 0);
m_propxy.SetValue(BlendShapePreset.LookUp, 0); // clear first
m_propxy.SetValue(BlendShapePreset.LookDown, VerticalDown.Map(-pitch));
}
else
{
// Up
m_propxy.SetValue(BlendShapePreset.LookDown, 0); // clear first
m_propxy.SetValue(BlendShapePreset.LookUp, VerticalUp.Map(pitch));
m_propxy.SetValue(BlendShapePreset.LookDown, 0);
}
}
}