Fixed some issues with TSTLT.

Author: MeltyPlayer

FinModelUtility/Games/MarioArtist/MarioArtist/src/010/tstlt.bt

@@ -470,11 +470,8 @@ typedef struct (uint fSegmentOffset) {
     //
     // This is done for each triplet (meshSegmentedAddress, primitiveDl, vertexDl).
 
-    uint primitiveDl[4] <bgcolor=COLOR_OFFSET>;
-    uint unk7[9];
-    
-    uint vertexDl[4] <bgcolor=COLOR_OFFSET>;
-    uint unk8[9];
+    uint primitiveDl[13] <bgcolor=COLOR_OFFSET>;    
+    uint vertexDl[13] <bgcolor=COLOR_OFFSET>;
 } MeshDefinition <bgcolor=COLOR_HEADER>;
 
 FSeek(0xc6c8);

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

@@ -47,6 +47,8 @@ public static void SetUp(
 
         if (patternParams.Unk1 == 0 && chosenPart0.Id == 0) {
           rsp.UvType = N64UvType.STANDARD;
+          rsp.TexScaleXShort = rsp.TexScaleYShort = 0xffff;
+
           rdp.CombinerCycleParams0 = new CombinerCycleParams {
               ColorMuxA = GenericColorMux.G_CCMUX_0,
               ColorMuxB = GenericColorMux.G_CCMUX_ENVIRONMENT,
@@ -156,7 +158,9 @@ public static void SetUpTexture(
           32,
           32,
           F3dWrapMode.CLAMP,
-          F3dWrapMode.CLAMP);
+          F3dWrapMode.CLAMP,
+          // TODO: Pretty sure this is right...???
+          tileDescriptorIndex: 1);
       return;
     }
 
@@ -168,7 +172,7 @@ public static void SetUpTexture(
       // TODO: I might be stupid, this might be 0x07c0?
       scale = GetTexScaleShortFromCommand_(0x07c0);
     } else {
-      rsp.UvType = N64UvType.LINEAR;
+      rsp.UvType = N64UvType.STANDARD;
       scale = GetTexScaleShortFromCommand_(0xffff);
     }
 
@@ -203,7 +207,9 @@ public static void SetUpTexture(
           32,
           F3dWrapMode.REPEAT,
           F3dWrapMode.MIRROR_REPEAT,
-          scale: scale);
+          scale: scale,
+          // TODO: Pretty sure this is right...???
+          tileDescriptorIndex: 1);
     } else {
       ushort shift = patternMaterialType switch {
           PatternMaterialType.BLEND_2X2
@@ -267,7 +273,9 @@ public static void SetUpTexture(
           F3dWrapMode.REPEAT,
           F3dWrapMode.REPEAT,
           scale: scale,
-          shift: shift);
+          shift: shift,
+          // TODO: Pretty sure this is right...???
+          tileDescriptorIndex: 1);
     }
   }
 
@@ -277,8 +285,6 @@ public static void SetUpOtherModeLAndCombiner(
       int someValue) {
     // From decomp, at 0x80115d08
 
-    // TODO: Implement
-
     var rdp = n64Hardware.Rdp;
     var rsp = n64Hardware.Rsp;
     var tmem = rdp.Tmem;

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

@@ -1,6 +1,5 @@
 using System.Drawing;
 using System.Numerics;
-using System.Xml.Linq;
 
 using CommunityToolkit.Diagnostics;
 
@@ -26,7 +25,6 @@
 using fin.schema.color;
 using fin.schema.vector;
 using fin.util.enumerables;
-using fin.util.linq;
 using fin.util.sets;
 
 using marioartist.schema;
@@ -636,8 +634,6 @@ var primitiveVertexDlTuples
             skinChosenPart.ChosenColor0);
       }
 
-      // TODO: It does something here with a hardcoded chosen part
-
       // TODO: Remove this
       n64Hardware.Rsp.CullingMode
           = GetCullingModeForChosenPartId_(chosenPart0.Id);

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

@@ -15,8 +15,8 @@ public sealed partial class MeshDefinition : IBinaryDeserializable {
   public uint[] Unk3 { get; } = new uint[3];
   public float[] Unk4 { get; } = new float[6];
 
-  public uint Unk5 { get; set; }
-  
   public uint[] PrimitiveDisplayListSegmentedAddresses { get; } = new uint[13];
   public uint[] VertexDisplayListSegmentedAddresses { get; } = new uint[13];
+
+  public uint Unk5 { get; set; }
 }

FinModelUtility/Libraries/F3dzex2/F3dzex2/model/DlModelBuilder.cs

@@ -362,8 +362,8 @@ var primLodFrac
                           equations.CreateColor(environmentAlpha),
                       GenericColorMux.G_CCMUX_PRIM_LOD_FRAC
                           => primLodFrac.Wrap(),
-                      GenericColorMux.G_CCMUX_SCALE         => color1,
-                      GenericColorMux.G_CCMUX_K5            => color1,
+                      GenericColorMux.G_CCMUX_SCALE => color1,
+                      GenericColorMux.G_CCMUX_K5    => color1,
                       _ => throw new ArgumentOutOfRangeException(
                           nameof(colorMux),
                           colorMux,
@@ -433,82 +433,10 @@ var primLodFrac
               equations.CreateScalarOutput(FixedFunctionSource.OUTPUT_ALPHA,
                                            combinedAlpha);
 
-              // TODO: Handle shade case by writing lighting to alpha
-
-              // Shamelessly stolen from:
-              // https://github.com/magcius/noclip.website/blob/main/src/zelview/f3dzex.ts#L135
-
-              BlenderPm srcColor, dstColor;
-              BlenderA srcFactor;
-              BlenderB dstFactor;
-
-              var doBlend = true;
-              if (rdp.ForceBlending) {
-                if (cycleParams1 != null) {
-                  srcColor = rdp.P1;
-                  srcFactor = rdp.A1;
-                  dstColor = rdp.M1;
-                  dstFactor = rdp.B1;
-                } else {
-                  srcColor = rdp.P0;
-                  srcFactor = rdp.A0;
-                  dstColor = rdp.M0;
-                  dstFactor = rdp.B0;
-                }
-              } else {
-                doBlend = cycleParams1 != null;
-                srcColor = rdp.P0;
-                srcFactor = rdp.A0;
-                dstColor = rdp.M0;
-                dstFactor = rdp.B0;
-              }
+              ApplyBlendMode_(n64Hardware, finMaterial);
 
               // TODO: I'm not sure if alpha compare is ever used on the N64
               finMaterial.DisableAlphaCompare();
-              if (!doBlend) {
-                finMaterial.SetBlending(BlendEquation.ADD,
-                                        BlendFactor.ONE,
-                                        BlendFactor.ZERO,
-                                        LogicOp.UNDEFINED);
-              }
-
-              if (srcFactor == BlenderA.G_BL_0 &&
-                  dstFactor == BlenderB.G_BL_1) {
-                finMaterial.SetBlending(BlendEquation.ADD,
-                                        BlendFactor.ONE,
-                                        BlendFactor.ZERO,
-                                        LogicOp.UNDEFINED);
-              } else if (
-                  srcColor == dstColor &&
-                  srcFactor == BlenderA.G_BL_A_IN &&
-                  dstFactor == BlenderB.G_BL_1MA) {
-                finMaterial.SetBlending(BlendEquation.ADD,
-                                        BlendFactor.SRC_ALPHA,
-                                        BlendFactor.ONE_MINUS_SRC_ALPHA,
-                                        LogicOp.UNDEFINED);
-              } else {
-                BlendFactor blendSrcFactor;
-                if (srcFactor == BlenderA.G_BL_0) {
-                  blendSrcFactor = BlendFactor.ZERO;
-                } else if
-                    (rdp is {
-                         UseCoverageForAlpha: true,
-                         MultiplyCoverageWithAlpha: false
-                     }) {
-                  // this is technically "coverage", admitting blending on edges
-                  blendSrcFactor = BlendFactor.ONE;
-                } else {
-                  blendSrcFactor = BlendFactor.SRC_ALPHA;
-                }
-
-                var blendDstFactor =
-                    TranslateBlendParamB_(dstFactor, blendSrcFactor);
-
-                finMaterial.SetBlending(BlendEquation.ADD,
-                                        blendSrcFactor,
-                                        blendDstFactor,
-                                        LogicOp.UNDEFINED);
-              }
 
               // Shamelessly stolen from:
               // https://github.com/magcius/noclip.website/blob/main/src/zelview/f3dzex.ts#L109
@@ -529,6 +457,60 @@ var primLodFrac
             });
   }
 
+  private static void ApplyBlendMode_(
+      IN64Hardware n64Hardware,
+      IMaterial finMaterial) {
+    // TODO: What does "FORCE_BL" do?
+    // TODO: Is it possible to support two-cycle blending, maybe via a shader?
+    // TODO: Figure out how to better support this
+
+    // HACK: Just kind of tries to see if we should do additive blending.
+    // I have no idea how to properly implement this. 
+
+    var rdp = n64Hardware.Rdp;
+
+    var doAdditiveBlending
+        = ShouldDoAdditiveBlendingFor_(rdp.P0, rdp.A0, rdp.M0, rdp.B0);
+    if (rdp.CycleType is CycleType.TWO_CYCLE) {
+      doAdditiveBlending
+          |= ShouldDoAdditiveBlendingFor_(rdp.P1, rdp.A1, rdp.M1, rdp.B1);
+    }
+
+    var useCoverageInsteadOfAlpha = rdp is {
+        UseCoverageForAlpha: true,
+        MultiplyCoverageWithAlpha: false
+    };
+
+    if (doAdditiveBlending && !useCoverageInsteadOfAlpha) {
+      finMaterial.SetBlending(
+          BlendEquation.ADD,
+          BlendFactor.SRC_ALPHA,
+          BlendFactor.ONE_MINUS_SRC_ALPHA,
+          LogicOp.UNDEFINED);
+    } else {
+      finMaterial.SetBlending(
+          BlendEquation.ADD,
+          BlendFactor.ONE,
+          BlendFactor.ZERO,
+          LogicOp.UNDEFINED);
+    }
+  }
+
+  private static bool ShouldDoAdditiveBlendingFor_(
+      BlenderPm p,
+      BlenderA a,
+      BlenderPm m,
+      BlenderB b) {
+    if (p is BlenderPm.G_BL_CLR_IN &&
+        m is BlenderPm.G_BL_CLR_MEM &&
+        a is BlenderA.G_BL_A_IN &&
+        b is BlenderB.G_BL_1MA or BlenderB.G_BL_A_MEM) {
+      return true;
+    }
+
+    return false;
+  }
+
   public ModelImpl<Normal1Color2UvVertexImpl> Model { get; }
 
   public IMesh StartNewMesh(string name) {
@@ -843,22 +825,6 @@ private IReadOnlyMaterial GetOrCreateMaterial_() {
     return this.cachedMaterial_;
   }
 
-  private static BlendFactor TranslateBlendParamB_(
-      BlenderB paramB,
-      BlendFactor srcParam) {
-    return paramB switch {
-        BlenderB.G_BL_1MA => srcParam switch {
-            BlendFactor.SRC_ALPHA => BlendFactor.ONE_MINUS_SRC_ALPHA,
-            BlendFactor.ONE       => BlendFactor.ZERO,
-            _                     => BlendFactor.ONE
-        },
-        BlenderB.G_BL_A_MEM => BlendFactor.DST_ALPHA,
-        BlenderB.G_BL_1 => BlendFactor.ONE,
-        BlenderB.G_BL_0 => BlendFactor.ZERO,
-        _ => throw new ArgumentOutOfRangeException(nameof(paramB), paramB, null)
-    };
-  }
-
   public Color OverrideVertexColor {
     get => this.vertices_.OverrideVertexColor;
     set => this.vertices_.OverrideVertexColor = value;