Skip to content

Commit a41e7c5

Browse files
committed
Increased resilience to some modded drawables
1 parent 126848c commit a41e7c5

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

CodeWalker.Core/GameFiles/Resources/Drawable.cs

+5
Original file line numberDiff line numberDiff line change
@@ -2381,6 +2381,11 @@ public override void Read(ResourceDataReader reader, params object[] parameters)
23812381
{
23822382
this.VertexData = this.VertexBuffer.Data1 ?? this.VertexBuffer.Data2;
23832383

2384+
if (this.VerticesCount == 0)
2385+
{
2386+
this.VerticesCount = (ushort)(this.VertexData?.VertexCount ?? 0);
2387+
}
2388+
23842389
//if (VertexBuffer.Data1 != VertexBuffer.Data2)
23852390
//{ }//no hit
23862391
//if (VertexDataPointer == 0)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"profiles": {
3+
"CodeWalker.RPFExplorer": {
4+
"commandName": "Project",
5+
"workingDirectory": ".."
6+
}
7+
}
8+
}

CodeWalker/Rendering/Shaders/BasicShader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ public override void SetEntityVars(DeviceContext context, ref RenderableInst ren
580580

581581
public override void SetModelVars(DeviceContext context, RenderableModel model)
582582
{
583-
if (model.Owner.Skeleton?.BoneTransforms != null)
583+
if ((model.Owner.Skeleton?.BoneTransforms != null) && (model.Owner.Skeleton.BoneTransforms.Length > 0))
584584
{
585585
SetBoneMatrices(context, model.Owner.Skeleton.BoneTransforms);
586586
defaultBoneMatricesBound = false;

CodeWalker/Rendering/Shaders/ShadowShader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public override void SetEntityVars(DeviceContext context, ref RenderableInst ren
235235

236236
public override void SetModelVars(DeviceContext context, RenderableModel model)
237237
{
238-
if (model.Owner.Skeleton?.BoneTransforms != null)
238+
if ((model.Owner.Skeleton?.BoneTransforms != null) && (model.Owner.Skeleton.BoneTransforms.Length > 0))
239239
{
240240
SetBoneMatrices(context, model.Owner.Skeleton.BoneTransforms);
241241
defaultBoneMatricesBound = false;

0 commit comments

Comments
 (0)