From d171fc9848b1ef1268af85fd2b8fae589b361951 Mon Sep 17 00:00:00 2001 From: bofeng Date: Wed, 11 Dec 2024 16:34:29 +0800 Subject: [PATCH] refine --- cocos/spine/skeleton-data.ts | 2 +- native/cocos/editor-support/spine-wasm/spine-type-export.cpp | 2 +- native/cocos/editor-support/spine-wasm/spine-wasm.cpp | 5 +---- native/cocos/editor-support/spine-wasm/spine-wasm.h | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cocos/spine/skeleton-data.ts b/cocos/spine/skeleton-data.ts index 4be051a4c7b..54d51d6f1d1 100644 --- a/cocos/spine/skeleton-data.ts +++ b/cocos/spine/skeleton-data.ts @@ -218,7 +218,7 @@ export class SkeletonData extends Asset { } else { const rawData = new Uint8Array(this._nativeAsset); const byteSize = rawData.length; - const ptr = spine.wasmUtil.queryStoreMemory(byteSize); + const ptr = spine.wasmUtil.createStoreMemory(byteSize); const wasmMem = spine.wasmUtil.wasm.HEAPU8.subarray(ptr, ptr + byteSize); wasmMem.set(rawData); this._skeletonCache = spine.wasmUtil.createSpineSkeletonDataWithBinary(byteSize, this._atlasText); diff --git a/native/cocos/editor-support/spine-wasm/spine-type-export.cpp b/native/cocos/editor-support/spine-wasm/spine-type-export.cpp index 77e006afbed..8c1296674c9 100644 --- a/native/cocos/editor-support/spine-wasm/spine-type-export.cpp +++ b/native/cocos/editor-support/spine-wasm/spine-type-export.cpp @@ -1382,7 +1382,7 @@ EMSCRIPTEN_BINDINGS(cocos_spine) { class_("SpineWasmUtil") .class_function("spineWasmInit", &SpineWasmUtil::spineWasmInit) .class_function("spineWasmDestroy", &SpineWasmUtil::spineWasmDestroy) - .class_function("queryStoreMemory", &SpineWasmUtil::queryStoreMemory) + .class_function("createStoreMemory", &SpineWasmUtil::createStoreMemory) .class_function("freeStoreMemory", &SpineWasmUtil::freeStoreMemory) .class_function("querySpineSkeletonDataByUUID", &SpineWasmUtil::querySpineSkeletonDataByUUID, allow_raw_pointers()) .class_function("createSpineSkeletonDataWithJson", &SpineWasmUtil::createSpineSkeletonDataWithJson, allow_raw_pointers()) diff --git a/native/cocos/editor-support/spine-wasm/spine-wasm.cpp b/native/cocos/editor-support/spine-wasm/spine-wasm.cpp index 29947efe70d..d0bbcc00a14 100644 --- a/native/cocos/editor-support/spine-wasm/spine-wasm.cpp +++ b/native/cocos/editor-support/spine-wasm/spine-wasm.cpp @@ -15,7 +15,6 @@ EventType SpineWasmUtil::s_currentType = EventType_Event; TrackEntry* SpineWasmUtil::s_currentEntry = nullptr; Event* SpineWasmUtil::s_currentEvent = nullptr; uint8_t* SpineWasmUtil::s_mem = nullptr; -uint32_t SpineWasmUtil::s_memSize = 0; void SpineWasmUtil::spineWasmInit() { // LogUtil::Initialize(); @@ -95,9 +94,8 @@ void SpineWasmUtil::destroySpineSkeleton(Skeleton* skeleton) { } } -uint32_t SpineWasmUtil::queryStoreMemory(uint32_t size) { +uint32_t SpineWasmUtil::createStoreMemory(uint32_t size) { s_mem = new uint8_t[size]; - s_memSize = size; return (uint32_t)s_mem; } @@ -107,7 +105,6 @@ void SpineWasmUtil::freeStoreMemory() { delete[] s_mem; s_mem = nullptr; } - s_memSize = 0; } uint32_t SpineWasmUtil::getCurrentListenerID() { diff --git a/native/cocos/editor-support/spine-wasm/spine-wasm.h b/native/cocos/editor-support/spine-wasm/spine-wasm.h index 655b7f743c1..26c775571c7 100644 --- a/native/cocos/editor-support/spine-wasm/spine-wasm.h +++ b/native/cocos/editor-support/spine-wasm/spine-wasm.h @@ -7,7 +7,7 @@ class SpineWasmUtil { public: static void spineWasmInit(); static void spineWasmDestroy(); - static uint32_t queryStoreMemory(uint32_t size); + static uint32_t createStoreMemory(uint32_t size); static void freeStoreMemory(); static spine::SkeletonData* querySpineSkeletonDataByUUID(const spine::String& uuid); @@ -28,5 +28,4 @@ class SpineWasmUtil { static spine::Event* s_currentEvent; static uint8_t* s_mem; - static uint32_t s_memSize; };