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

Peds no longer sharing skeletons, Cutscene object AnimHash conflict resolution

Browse Source
This commit is contained in:
dexy
2019-11-26 17:00:41 +11:00
Unverified
parent 17dcdd88a1
commit 91873ea87a
7 changed files with 215 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Rendering/Shaders/BasicShader.cs
+2 -2
View File
@@ -574,9 +574,9 @@ namespace CodeWalker.Rendering
public override void SetModelVars(DeviceContext context, RenderableModel model)
{
if (model.Owner.BoneTransforms != null)
if (model.Owner.Skeleton?.BoneTransforms != null)
{
SetBoneMatrices(context, model.Owner.BoneTransforms);
SetBoneMatrices(context, model.Owner.Skeleton.BoneTransforms);
defaultBoneMatricesBound = false;
}
else if (!defaultBoneMatricesBound)
Rendering/Shaders/ShadowShader.cs
+2 -2
View File
@@ -233,9 +233,9 @@ namespace CodeWalker.Rendering
public override void SetModelVars(DeviceContext context, RenderableModel model)
{
if (model.Owner.BoneTransforms != null)
if (model.Owner.Skeleton?.BoneTransforms != null)
{
SetBoneMatrices(context, model.Owner.BoneTransforms);
SetBoneMatrices(context, model.Owner.Skeleton.BoneTransforms);
defaultBoneMatricesBound = false;
}
else if (!defaultBoneMatricesBound)