@laplace.live/pixijs-live2d 0.6.0 → 0.6.1

package/dist/index.d.ts

@@ -6046,6 +6046,64 @@ declare class PartData {
   link: Array<PartData>;
 }
 //#endregion
+//#region vendor/cubism/src/model/cubismmoc.d.ts
+/**
+ * Mocデータの管理
+ *
+ * Mocデータの管理を行うクラス。
+ */
+declare class CubismMoc {
+  /**
+   * Mocデータの作成
+   */
+  static create(mocBytes: ArrayBuffer, shouldCheckMocConsistency: boolean): CubismMoc;
+  /**
+   * Mocデータを削除
+   *
+   * Mocデータを削除する
+   */
+  static delete(moc: CubismMoc): void;
+  /**
+   * モデルを作成する
+   *
+   * @return Mocデータから作成されたモデル
+   */
+  createModel(): CubismModel;
+  /**
+   * モデルを削除する
+   */
+  deleteModel(model: CubismModel): void;
+  /**
+   * コンストラクタ
+   */
+  private constructor();
+  /**
+   * デストラクタ相当の処理
+   */
+  release(): void;
+  /**
+   * 最新の.moc3 Versionを取得
+   */
+  getLatestMocVersion(): number;
+  /**
+   * 読み込んだモデルの.moc3 Versionを取得
+   */
+  getMocVersion(): number;
+  /**
+   * Mocファイルのbufferから.moc3 Versionを取得
+   * @param mocBytes Mocファイルのバイト配列
+   * @returns .moc3 Version番号
+   */
+  static getMocVersionFromBuffer(mocBytes: ArrayBuffer): number;
+  /**
+   * .moc3 の整合性を検証する
+   */
+  static hasMocConsistency(mocBytes: ArrayBuffer): boolean;
+  _moc: Live2DCubismCore.Moc;
+  _modelCount: number;
+  _mocVersion: number;
+}
+//#endregion
 //#region vendor/cubism/src/math/cubismvector2.d.ts
 /**
  * Copyright(c) Live2D Inc. All rights reserved.
@@ -7065,6 +7123,8 @@ export declare class CubismInternalModel extends InternalModel {
   pose?: CubismPose;
   physics?: CubismPhysics;
   renderer: CubismRenderer_WebGL;
+  /** The moc {@link coreModel} was built from; it must outlive the model, so {@link destroy} releases it last. */
+  private readonly moc;
   private readonly idManager;
   /** Context the renderer was last started up against; also the offscreen-pool refcount key. */
   private renderContext?;
@@ -7084,7 +7144,7 @@ export declare class CubismInternalModel extends InternalModel {
    * Matrix that scales by {@link pixelsPerUnit}, and moves the origin from top-left to center.
    */
   protected modelTransform: Matrix;
-  constructor(coreModel: CubismModel, settings: CubismModelSettings, options?: InternalModelOptions);
+  constructor(coreModel: CubismModel, moc: CubismMoc, settings: CubismModelSettings, options?: InternalModelOptions);
   protected init(): void;
   protected getIdSafe(id: string | undefined): CubismIdHandle;
   protected getSize(): [number, number];

package/dist/index.js

@@ -15433,6 +15433,8 @@ var CubismInternalModel = class extends InternalModel {
 	breathEnabled = true;
 	eyeBlink;
 	renderer = new CubismRenderer_WebGL(0, 0);
+	/** The moc {@link coreModel} was built from; it must outlive the model, so {@link destroy} releases it last. */
+	moc;
 	idManager;
 	/** Context the renderer was last started up against; also the offscreen-pool refcount key. */
 	renderContext;
@@ -15452,9 +15454,10 @@ var CubismInternalModel = class extends InternalModel {
 	* Matrix that scales by {@link pixelsPerUnit}, and moves the origin from top-left to center.
 	*/
 	modelTransform = new Matrix();
-	constructor(coreModel, settings, options) {
+	constructor(coreModel, moc, settings, options) {
 		super();
 		this.coreModel = coreModel;
+		this.moc = moc;
 		this.settings = settings;
 		this.options = Object.assign({}, {
 			breathDepth: 1,
@@ -15658,7 +15661,8 @@ var CubismInternalModel = class extends InternalModel {
 		detachPooledRenderTargets(this.renderer);
 		this.renderer.release();
 		if (gl) releaseOffscreenPool(gl);
-		this.coreModel.release();
+		this.moc.deleteModel(this.coreModel);
+		this.moc.release();
 		this.renderer = void 0;
 		this.coreModel = void 0;
 	}
@@ -16327,6 +16331,8 @@ function reconfigureCubismSDK(config = {}) {
 }
 //#endregion
 //#region src/cubism/factory.ts
+/** Each core model's moc, from createCoreModel to the internal model that takes ownership of both. */
+const mocs = /* @__PURE__ */ new WeakMap();
 Live2DFactory.registerRuntime({
 	version: 4,
 	ready: cubismReady,
@@ -16345,7 +16351,7 @@ Live2DFactory.registerRuntime({
 		const moc = CubismMoc.create(data, !!options?.checkMocConsistency);
 		try {
 			const model = moc.createModel();
-			model.__moc = moc;
+			mocs.set(model, moc);
 			return model;
 		} catch (e) {
 			try {
@@ -16357,14 +16363,9 @@ Live2DFactory.registerRuntime({
 		}
 	},
 	createInternalModel(coreModel, settings, options) {
-		const model = new CubismInternalModel(coreModel, settings, options);
-		const coreModelWithMoc = coreModel;
-		if (coreModelWithMoc.__moc) {
-			model.__moc = coreModelWithMoc.__moc;
-			delete coreModelWithMoc.__moc;
-			model.once("destroy", releaseMoc);
-		}
-		return model;
+		const moc = mocs.get(coreModel);
+		if (!moc) throw new TypeError("Cubism core model was not created by this runtime.");
+		return new CubismInternalModel(coreModel, moc, settings, options);
 	},
 	createPhysics(_coreModel, data) {
 		if (!(data instanceof ArrayBuffer)) throw new TypeError("Cubism physics data must be an ArrayBuffer.");
@@ -16375,9 +16376,6 @@ Live2DFactory.registerRuntime({
 		return CubismPose.create(data, data.byteLength);
 	}
 });
-function releaseMoc() {
-	this.__moc?.release();
-}
 //#endregion
 export { Constant, CubismExpressionManager, CubismFramework, CubismInternalModel, CubismModelSettings, CubismMotionManager, CubismParallelMotionManager, ExpressionManager, FileLoader, FocusController, InternalModel, LOGICAL_HEIGHT, LOGICAL_WIDTH, Live2DFactory, Live2DLoader, Live2DModel, Live2DPlugin, Live2DTransform, LogLevel, MBToByte, ModelSettings, MotionManager, MotionPreloadStrategy, MotionPriority, MotionState, Option, SoundManager, VOLUME, XHRLoader, applyMixins, clamp, config, configureCubismSDK, copyArray, copyProperty, csmDelete, cubismReady, folderName, logger, normalizeHitAreaDefs, rand, reconfigureCubismSDK, remove, resolveURL, startUpCubism, strtod };