From b09e189c6438cb9358005771c3304b8f52bc4e30 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 6 Nov 2023 13:30:50 +0100 Subject: [PATCH 1/2] [ts] Add missing .js extensions. --- spine-ts/spine-core/src/AtlasAttachmentLoader.ts | 2 +- spine-ts/spine-phaser/src/SpineGameObject.ts | 2 +- spine-ts/spine-pixi/src/Spine.ts | 6 +++--- spine-ts/spine-pixi/src/SpineDebugRenderer.ts | 2 +- spine-ts/spine-pixi/src/index.ts | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spine-ts/spine-core/src/AtlasAttachmentLoader.ts b/spine-ts/spine-core/src/AtlasAttachmentLoader.ts index 7c6631dbe..369c3ba90 100644 --- a/spine-ts/spine-core/src/AtlasAttachmentLoader.ts +++ b/spine-ts/spine-core/src/AtlasAttachmentLoader.ts @@ -36,7 +36,7 @@ import { PointAttachment } from "./attachments/PointAttachment.js"; import { RegionAttachment } from "./attachments/RegionAttachment.js"; import { Skin } from "./Skin.js"; import { TextureAtlas } from "./TextureAtlas.js"; -import { Sequence } from "./attachments/Sequence" +import { Sequence } from "./attachments/Sequence.js" /** An {@link AttachmentLoader} that configures attachments using texture regions from an {@link TextureAtlas}. * diff --git a/spine-ts/spine-phaser/src/SpineGameObject.ts b/spine-ts/spine-phaser/src/SpineGameObject.ts index 980732aa5..e05ea0e61 100644 --- a/spine-ts/spine-phaser/src/SpineGameObject.ts +++ b/spine-ts/spine-phaser/src/SpineGameObject.ts @@ -38,7 +38,7 @@ import { VisibleMixin, AlphaMixin, OriginMixin, -} from "./mixins"; +} from "./mixins.js"; import { AnimationState, AnimationStateData, diff --git a/spine-ts/spine-pixi/src/Spine.ts b/spine-ts/spine-pixi/src/Spine.ts index e8ef4e205..71f3215a3 100644 --- a/spine-ts/spine-pixi/src/Spine.ts +++ b/spine-ts/spine-pixi/src/Spine.ts @@ -43,9 +43,9 @@ import { Utils, Vector2, } from "@esotericsoftware/spine-core"; -import type { SpineTexture } from "./SpineTexture"; -import { SlotMesh } from "./SlotMesh"; -import type { ISpineDebugRenderer } from "./SpineDebugRenderer"; +import type { SpineTexture } from "./SpineTexture.js"; +import { SlotMesh } from "./SlotMesh.js"; +import type { ISpineDebugRenderer } from "./SpineDebugRenderer.js"; import { Assets } from "@pixi/assets"; import type { IPointData } from "@pixi/core"; import { Ticker, utils } from "@pixi/core"; diff --git a/spine-ts/spine-pixi/src/SpineDebugRenderer.ts b/spine-ts/spine-pixi/src/SpineDebugRenderer.ts index c217d9e70..135cd37e4 100644 --- a/spine-ts/spine-pixi/src/SpineDebugRenderer.ts +++ b/spine-ts/spine-pixi/src/SpineDebugRenderer.ts @@ -30,7 +30,7 @@ import { Container } from "@pixi/display"; import { Graphics } from "@pixi/graphics"; import { Text } from "@pixi/text"; -import type { Spine } from "./Spine"; +import type { Spine } from "./Spine.js"; import type { AnimationStateListener } from "@esotericsoftware/spine-core"; import { ClippingAttachment, MeshAttachment, PathAttachment, RegionAttachment, SkeletonBounds } from "@esotericsoftware/spine-core"; diff --git a/spine-ts/spine-pixi/src/index.ts b/spine-ts/spine-pixi/src/index.ts index d42128df3..6eb890c0b 100644 --- a/spine-ts/spine-pixi/src/index.ts +++ b/spine-ts/spine-pixi/src/index.ts @@ -43,5 +43,5 @@ export * from './darkTintMesh/DarkTintRenderer.js'; export * from "@esotericsoftware/spine-core"; -import './assets/atlasLoader'; // Side effects install the loaders into pixi -import './assets/skeletonLoader'; // Side effects install the loaders into pixi +import './assets/atlasLoader.js'; // Side effects install the loaders into pixi +import './assets/skeletonLoader.js'; // Side effects install the loaders into pixi From f9bf739498f8395ad582b403266344a956477792 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 13 Nov 2023 15:36:56 +0100 Subject: [PATCH 2/2] [unity] Fixed a memory leak in SkeletonPartsRenderer. Closes #2414. --- .../SkeletonRenderSeparator/SkeletonPartsRenderer.cs | 4 ++++ spine-unity/Assets/Spine/package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs index c0174ed80..0f4dd07e6 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs @@ -85,6 +85,10 @@ void LazyIntialize () { } } + void OnDestroy () { + if (buffers != null) buffers.Dispose(); + } + public void ClearMesh () { LazyIntialize(); meshFilter.sharedMesh = null; diff --git a/spine-unity/Assets/Spine/package.json b/spine-unity/Assets/Spine/package.json index 38d7971fd..3d041d61c 100644 --- a/spine-unity/Assets/Spine/package.json +++ b/spine-unity/Assets/Spine/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.spine-unity", "displayName": "spine-unity Runtime", "description": "This plugin provides the spine-unity runtime core.", - "version": "4.1.30", + "version": "4.1.31", "unity": "2018.3", "author": { "name": "Esoteric Software",