ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2026-05-14 15:34:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Peds facial animations progress

Browse Source
This commit is contained in:
dexy
2020-03-06 03:02:40 +11:00
Unverified
parent 917407c2e6
commit 26183af00d
6 changed files with 196 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CodeWalker/Rendering/Renderable.cs
+30 -4
View File
@@ -83,6 +83,7 @@ namespace CodeWalker.Rendering
public double CurrentAnimTime = 0;
public YcdFile ClipDict;
public ClipMapEntry ClipMapEntry;
public Expression Expression;
public Dictionary<ushort, RenderableModel> ModelBoneLinks;
public bool EnableRootMotion = false; //used to toggle whether or not to include root motion when playing animations
@@ -520,10 +521,27 @@ namespace CodeWalker.Rendering
for (int i = 0; i < anim.BoneIds.data_items.Length; i++)
{
var boneiditem = anim.BoneIds.data_items[i];
var boneid = boneiditem.BoneId;
var track = boneiditem.Track;
if (Expression?.BoneTracksDict != null)
{
var exprbt = new ExpressionBoneTrack() { BoneTag = boneid, Track = track, Flags = boneiditem.Unk0 };
var exprbtmap = exprbt;
if ((track == 24) || (track == 25) || (track == 26))
{
if (Expression.BoneTracksDict.TryGetValue(exprbt, out exprbtmap))
{
boneid = exprbtmap.BoneTag;
}
else
{ }
}
}
Bone bone = null;
skel?.BonesMap?.TryGetValue(boneiditem.BoneId, out bone);
skel?.BonesMap?.TryGetValue(boneid, out bone);
if (bone == null)
{
continue;
@@ -564,11 +582,19 @@ namespace CodeWalker.Rendering
break;
case 8://quaternion... (camera rotation?)
break;
case 24://face stuff?
case 24://face stuff
v = anim.EvaluateVector4(frame, i, interpolate); //single float
//bone.AnimTranslation = v.XYZ();
//bone.AnimRotation = Quaternion.RotationYawPitchRoll(v.X, 0.0f, 0.0f);
break;
case 25://face stuff?
case 25://face stuff
v = anim.EvaluateVector4(frame, i, interpolate); //vector3 roll/pitch/yaw
var mult = -0.314159265f;
bone.AnimRotation = Quaternion.RotationYawPitchRoll(v.Z * mult, v.Y * mult, v.X * mult);
break;
case 26://face stuff?
case 26://face stuff
q = anim.EvaluateQuaternion(frame, i, interpolate);
//bone.AnimRotation = q;
break;
case 27:
case 50:
CodeWalker/Rendering/Renderer.cs
+4 -3
View File
@@ -2833,7 +2833,7 @@ namespace CodeWalker.Rendering
return res;
}
public bool RenderDrawable(DrawableBase drawable, Archetype arche, YmapEntityDef entity, uint txdHash = 0, TextureDictionary txdExtra = null, Texture diffOverride = null, ClipMapEntry animClip = null, ClothInstance cloth = null)
public bool RenderDrawable(DrawableBase drawable, Archetype arche, YmapEntityDef entity, uint txdHash = 0, TextureDictionary txdExtra = null, Texture diffOverride = null, ClipMapEntry animClip = null, ClothInstance cloth = null, Expression expr = null)
{
//enqueue a single drawable for rendering.
@@ -2859,7 +2859,7 @@ namespace CodeWalker.Rendering
}
rndbl.Cloth = cloth;
rndbl.Expression = expr;
return RenderRenderable(rndbl, arche, entity);
}
@@ -3150,6 +3150,7 @@ namespace CodeWalker.Rendering
var drawable = ped.Drawables[i];
var texture = ped.Textures[i];
var cloth = ped.Clothes[i];
var expr = ped.Expressions[i];
//if (compData == null) return;
if (drawable == null) return;
@@ -3192,7 +3193,7 @@ namespace CodeWalker.Rendering
if (drawFlag)
{
RenderDrawable(drawable, null, ped.RenderEntity, 0, td, texture, ac, cloth);
RenderDrawable(drawable, null, ped.RenderEntity, 0, td, texture, ac, cloth, expr);
}