diff --git a/spine-ts/index.html b/spine-ts/index.html
index 181095cc3..205d3e1f4 100644
--- a/spine-ts/index.html
+++ b/spine-ts/index.html
@@ -18,7 +18,20 @@
Phaser
Player
diff --git a/spine-ts/spine-canvas/src/SkeletonRenderer.ts b/spine-ts/spine-canvas/src/SkeletonRenderer.ts
index 01bc2efca..6088a8abc 100644
--- a/spine-ts/spine-canvas/src/SkeletonRenderer.ts
+++ b/spine-ts/spine-canvas/src/SkeletonRenderer.ts
@@ -124,12 +124,12 @@ export class SkeletonRenderer {
if (attachment instanceof RegionAttachment) {
let regionAttachment = attachment;
vertices = this.computeRegionVertices(slot, regionAttachment, false);
- triangles = SkeletonRenderer.QUAD_TRIANGLES;
+ triangles = SkeletonRenderer.QUAD_TRIANGLES;
texture = (regionAttachment.region!.texture).getImage() as HTMLImageElement;
} else if (attachment instanceof MeshAttachment) {
let mesh = attachment;
vertices = this.computeMeshVertices(slot, mesh, false);
- triangles = mesh.triangles;
+ triangles = mesh.triangles;
texture = (mesh.region!.texture).getImage() as HTMLImageElement;
} else
continue;
diff --git a/spine-ts/spine-core/src/AtlasAttachmentLoader.ts b/spine-ts/spine-core/src/AtlasAttachmentLoader.ts
index c8af304ed..aaac60208 100644
--- a/spine-ts/spine-core/src/AtlasAttachmentLoader.ts
+++ b/spine-ts/spine-core/src/AtlasAttachmentLoader.ts
@@ -55,7 +55,7 @@ export class AtlasAttachmentLoader implements AttachmentLoader {
let path = sequence.getPath(basePath, i);
let region = this.atlas.findRegion(path);
if (region == null) throw new Error("Region not found in atlas: " + path + " (sequence: " + name + ")");
- regions[i] = region;
+ regions[i] = region;
}
}
@@ -65,7 +65,7 @@ export class AtlasAttachmentLoader implements AttachmentLoader {
this.loadSequence(name, path, sequence);
} else {
let region = this.atlas.findRegion(path);
- if (!region) throw new Error("Region not found in atlas: " + path + " (region attachment: " + name + ")");
+ if (!region) throw new Error("Region not found in atlas: " + path + " (region attachment: " + name + ")");
attachment.region = region;
}
return attachment;
@@ -77,7 +77,7 @@ export class AtlasAttachmentLoader implements AttachmentLoader {
this.loadSequence(name, path, sequence);
} else {
let region = this.atlas.findRegion(path);
- if (!region) throw new Error("Region not found in atlas: " + path + " (mesh attachment: " + name + ")");
+ if (!region) throw new Error("Region not found in atlas: " + path + " (mesh attachment: " + name + ")");
attachment.region = region;
}
return attachment;
diff --git a/spine-ts/spine-phaser/example/index.html b/spine-ts/spine-phaser/example/index.html
deleted file mode 100644
index cf7041918..000000000
--- a/spine-ts/spine-phaser/example/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
- Spine Phaser Example
-
-
-
- Spine Phaser
-
-
-
-
\ No newline at end of file
diff --git a/spine-ts/spine-phaser/example/mix-and-match.html b/spine-ts/spine-phaser/example/mix-and-match.html
new file mode 100644
index 000000000..87304dfbd
--- /dev/null
+++ b/spine-ts/spine-phaser/example/mix-and-match.html
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+ Spine Phaser Example
+
+
+
+ Mix and match
+
+
+
+
\ No newline at end of file
diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-SkeletonLit-ForwardPass-URP.hlsl b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-SkeletonLit-ForwardPass-URP.hlsl
index e40d392b2..1f93ac4a7 100644
--- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-SkeletonLit-ForwardPass-URP.hlsl
+++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-SkeletonLit-ForwardPass-URP.hlsl
@@ -180,7 +180,7 @@ half4 frag(VertexOutput i
i.color.rgb = lerp(i.shadowedColor, i.color.rgb, shadowAttenuation);
#endif
-#ifdef _WRITE_RENDERING_LAYERS
+#ifdef USE_WRITE_RENDERING_LAYERS
uint renderingLayers = GetMeshRenderingLayerBackwardsCompatible();
outRenderingLayers = float4(EncodeMeshRenderingLayer(renderingLayers), 0, 0, 0);
#endif