Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

🐛 Fixed Unity 2019.4 compatibility

Browse source
This commit is contained in:
Edgar 2023-08-29 10:51:51 +02:00
parent 1082e05d89
commit cdc055f14f
No known key found for this signature in database
GPG key ID: 9AA5DDFFCBDCE46A
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/unity-avatar-exporter/Assets/Editor/AvatarExporter/AvatarExporter.cs
View file

@ -663,7 +663,7 @@ class AvatarExporter : MonoBehaviour
if (!currentFst.jointRotationList.Exists(x => x.BoneName == norBName)) if (!currentFst.jointRotationList.Exists(x => x.BoneName == norBName))
// swap from left-handed (Unity) to right-handed (Overte) coordinates and write out joint rotation offset to fst // swap from left-handed (Unity) to right-handed (Overte) coordinates and write out joint rotation offset to fst
currentFst.jointRotationList.Add( currentFst.jointRotationList.Add(
new JointRotationOffset(norBName, -jointOffset.x, jointOffset.y, jointOffset.z, -jointOffset.w) new JointRotationOffset2(norBName, -jointOffset.x, jointOffset.y, jointOffset.z, -jointOffset.w)
); );
else else
currentFst.jointRotationList.Find(x => x.BoneName == norBName).offset = currentFst.jointRotationList.Find(x => x.BoneName == norBName).offset =

26
tools/unity-avatar-exporter/Assets/Editor/AvatarExporter/FST.cs
View file

@ -25,7 +25,7 @@ namespace Overte
public JointMap(string RawInput) public JointMap(string RawInput)
{ {
var parsed = parseRx.Matches(RawInput).First(); var parsed = parseRx.Matches(RawInput)[0];
From = parsed.Groups["From"].Value.Trim(); From = parsed.Groups["From"].Value.Trim();
To = parsed.Groups["To"].Value.Trim(); To = parsed.Groups["To"].Value.Trim();
} }
@ -47,7 +47,7 @@ namespace Overte
public Joint(string RawInput) public Joint(string RawInput)
{ {
var parsed = parseRx.Matches(RawInput).First(); var parsed = parseRx.Matches(RawInput)[0];
From = parsed.Groups["From"].Value.Trim(); From = parsed.Groups["From"].Value.Trim();
To = parsed.Groups["To"].Value.Trim(); To = parsed.Groups["To"].Value.Trim();
} }
@ -60,16 +60,16 @@ namespace Overte
public override string ToString() => $"joint = {From} = {To}"; public override string ToString() => $"joint = {From} = {To}";
} }
class JointRotationOffset class JointRotationOffset2
{ {
public string BoneName; public string BoneName;
public Quaternion offset; public Quaternion offset;
private Regex parseRx = new Regex(@"(?<BoneName>.*)\s*=\s*\(\s*(?<X>.*)\s*,\s*(?<Y>.*)\s*,\s*(?<Z>.*)\s*,\s*(?<W>.*)\s*\)", RegexOptions.Compiled | RegexOptions.IgnoreCase); private Regex parseRx = new Regex(@"(?<BoneName>.*)\s*=\s*\(\s*(?<X>.*)\s*,\s*(?<Y>.*)\s*,\s*(?<Z>.*)\s*,\s*(?<W>.*)\s*\)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
public JointRotationOffset(string value) public JointRotationOffset2(string value)
{ {
var parsed = parseRx.Matches(value).First(); var parsed = parseRx.Matches(value)[0];
BoneName = parsed.Groups["BoneName"].Value.Trim(); BoneName = parsed.Groups["BoneName"].Value.Trim();
offset = new Quaternion offset = new Quaternion
{ {
@ -80,7 +80,7 @@ namespace Overte
}; };
} }
public JointRotationOffset(string boneName, float x, float y, float z, float w) public JointRotationOffset2(string boneName, float x, float y, float z, float w)
{ {
BoneName = boneName; BoneName = boneName;
offset = new Quaternion(x, y, z, w); offset = new Quaternion(x, y, z, w);
@ -99,7 +99,7 @@ namespace Overte
public RemapBlendShape(string rawData) public RemapBlendShape(string rawData)
{ {
var parsed = parseRx.Matches(rawData).First(); var parsed = parseRx.Matches(rawData)[0];
From = parsed.Groups["From"].Value.Trim(); From = parsed.Groups["From"].Value.Trim();
To = parsed.Groups["To"].Value.Trim(); To = parsed.Groups["To"].Value.Trim();
Multiplier = float.Parse(parsed.Groups["Multiplier"].Value, CultureInfo.InvariantCulture); Multiplier = float.Parse(parsed.Groups["Multiplier"].Value, CultureInfo.InvariantCulture);
@ -117,7 +117,7 @@ namespace Overte
public JointIndex(string rawData) public JointIndex(string rawData)
{ {
var parsed = parseRx.Matches(rawData).First(); var parsed = parseRx.Matches(rawData)[0];
BoneName = parsed.Groups["BoneName"].Value.Trim(); BoneName = parsed.Groups["BoneName"].Value.Trim();
Index = int.Parse(parsed.Groups["Index"].Value); Index = int.Parse(parsed.Groups["Index"].Value);
} }
@ -140,7 +140,7 @@ namespace Overte
public List<Joint> jointList = new List<Joint>(); public List<Joint> jointList = new List<Joint>();
public List<JointMap> jointMapList = new List<JointMap>(); public List<JointMap> jointMapList = new List<JointMap>();
public List<JointRotationOffset> jointRotationList = new List<JointRotationOffset>(); public List<JointRotationOffset2> jointRotationList = new List<JointRotationOffset2>();
public List<JointIndex> jointIndexList = new List<JointIndex>(); public List<JointIndex> jointIndexList = new List<JointIndex>();
public List<string> freeJointList = new List<string>(); public List<string> freeJointList = new List<string>();
@ -219,6 +219,7 @@ namespace Overte
foreach (var l in rawFst) foreach (var l in rawFst)
{ {
if (!parseRx.IsMatch(l)) continue;
var match = parseRx.Matches(l)[0]; var match = parseRx.Matches(l)[0];
ParseLine(match.Groups["Key"].Value.Trim(), match.Groups["Value"].Value.Trim()); ParseLine(match.Groups["Key"].Value.Trim(), match.Groups["Value"].Value.Trim());
} }
@ -267,8 +268,11 @@ namespace Overte
case "jointMap": case "jointMap":
jointMapList.Add(new JointMap(value)); jointMapList.Add(new JointMap(value));
break; break;
case "jointRotationOffset":
// Old version, does not seem to be used
break;
case "jointRotationOffset2": case "jointRotationOffset2":
jointRotationList.Add(new JointRotationOffset(value)); jointRotationList.Add(new JointRotationOffset2(value));
break; break;
case "jointIndex": case "jointIndex":
jointIndexList.Add(new JointIndex(value)); jointIndexList.Add(new JointIndex(value));
@ -289,7 +293,7 @@ namespace Overte
private KeyValuePair<string, string> ParseKVPair(Regex rx, string sinput) private KeyValuePair<string, string> ParseKVPair(Regex rx, string sinput)
{ {
var match = rx.Matches(sinput).First(); var match = rx.Matches(sinput)[0];
return new KeyValuePair<string, string>(match.Groups["Key"].Value.Trim(), match.Groups["Value"].Value.Trim()); return new KeyValuePair<string, string>(match.Groups["Key"].Value.Trim(), match.Groups["Value"].Value.Trim());
} }
} }