Skip to content

Commit caa346b

Browse files
committed
Added names to TSTLT meshes to make things easier to debug.
1 parent 04a7d3c commit caa346b

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

FinModelUtility/Games/MarioArtist/MarioArtist/src/api/TstltModelLoader.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,8 @@ private static IReadOnlyList<IMesh> TryToAddChosenPart0Tuple_(
616616
var nonzeroMeshCount
617617
= meshDefinition.MeshSegmentedAddresses.Count(a => a != 0);
618618

619+
string name = "";
620+
619621
var addedDisplayList = false;
620622
var meshes = new List<IMesh>();
621623
for (var i = 0; i < 4; ++i) {
@@ -684,20 +686,29 @@ var usePattern
684686
OneOf<uint, Color>.FromT1(
685687
chosenPart0.ChosenColor0.Color.ToSystemColor()),
686688
chosenPart0.Pattern0MaterialType);
689+
690+
name = "w mesh, skin";
687691
} else {
688692
if (usePattern) {
689693
SetCombinerForPattern_(n64Hardware, chosenPart0, i, withTexture);
694+
695+
name = $"w mesh, pattern {i}";
690696
} else {
691697
SetAdditiveBlending_(n64Hardware);
692698
SetCombiner_(n64Hardware, withTexture, true);
699+
700+
name = $"w mesh, extra";
693701
}
694702
}
695703
} else {
696704
if (usePattern) {
697705
SetCombinerForPattern_(n64Hardware, chosenPart0, i, true);
706+
name = $"w/o mesh, pattern {i}";
698707
} else {
699708
SetAdditiveBlending_(n64Hardware);
700709
SetCombiner_(n64Hardware, true, true);
710+
711+
name = $"w/o mesh, extra";
701712
}
702713
}
703714

@@ -756,7 +767,7 @@ jointIndex is not ((int) JointIndex.UPPER_ARM_1
756767
segment,
757768
n64Hardware,
758769
dlModelBuilder,
759-
$"joint({(JointIndex) jointIndex}): chosenPart0(id: {chosenPart0.Id}, meshSetId: {meshDefinition.MeshSetId}, unkSection5: {unkSection5I}, subUnkSection5: {subUnkSection5I}): {meshSegmentedAddress.ToHexString()}",
770+
$"joint({(JointIndex) jointIndex}): chosenPart0(id: {chosenPart0.Id}, meshSetId: {meshDefinition.MeshSetId}, unkSection5: {unkSection5I}, subUnkSection5: {subUnkSection5I}): {name}, {meshSegmentedAddress.ToHexString()}",
760771
joint.isLeft,
761772
displayLists);
762773
if (mesh != null) {
@@ -978,7 +989,7 @@ private static void SetCombinerForPattern_(
978989
patternI switch {
979990
0 => chosenPart0.Pattern0MaterialType,
980991
1 => chosenPart0.Pattern1MaterialType,
981-
2 => chosenPart0.MarkMaterialType,
992+
2 => PatternMaterialType.BLEND_1X1,
982993
});
983994

984995
if (isMark) {

FinModelUtility/Games/MarioArtist/MarioArtist/src/schema/talent_studio/ChosenPart0.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ public sealed partial class ChosenPart0 : IBinaryDeserializable {
3939

4040
public uint[] Unk3 { get; } = new uint[2];
4141
public uint MarkSegmentedAddress { get; set; }
42-
public PatternMaterialType MarkMaterialType { get; set; }
42+
public uint Unk4 { get; set; }
4343
}

0 commit comments

Comments
 (0)