diff --git a/native/cocos/bindings/dop/ArrayPool.cpp b/native/cocos/bindings/dop/ArrayPool.cpp index f5cd790472..5460d425dc 100644 --- a/native/cocos/bindings/dop/ArrayPool.cpp +++ b/native/cocos/bindings/dop/ArrayPool.cpp @@ -21,13 +21,13 @@ ArrayPool::~ArrayPool() { Object *ArrayPool::alloc(uint index) { uint bytes = _size * BYTES_PER_ELEMENT; auto obj = Object::createTypedArray(Object::TypedArrayType::UINT32, nullptr, bytes); + obj->incRef(); _objects[index] = obj; - _indexes[obj] = index; return obj; } -Object *ArrayPool::resize(Object *origin, uint size) { +Object *ArrayPool::resize(Object *origin, uint size, uint index) { uint bytes = size * BYTES_PER_ELEMENT; uint8_t *buffer = static_cast(CC_MALLOC(bytes)); if (!buffer) { @@ -44,10 +44,8 @@ Object *ArrayPool::resize(Object *origin, uint size) { auto obj = Object::createTypedArray(Object::TypedArrayType::UINT32, buffer, bytes); CC_FREE(buffer); - uint originIndex = _indexes[origin]; - _objects[originIndex] = obj; - _indexes[obj] = originIndex; - _indexes.erase(origin); + CC_ASSERT(_objects.count(index) != 0); + _objects[index] = obj; return obj; } diff --git a/native/cocos/bindings/dop/ArrayPool.h b/native/cocos/bindings/dop/ArrayPool.h index b8274cd461..6e11d91df8 100644 --- a/native/cocos/bindings/dop/ArrayPool.h +++ b/native/cocos/bindings/dop/ArrayPool.h @@ -17,13 +17,12 @@ public: ~ArrayPool(); Object *alloc(uint index); - Object *resize(Object *origin, uint size); + Object *resize(Object *origin, uint size, uint index); private: static cc::map _pools; cc::map _objects; - cc::map _indexes; PoolType _type; uint _size = 0; }; diff --git a/native/cocos/bindings/dop/jsb_dop.cpp b/native/cocos/bindings/dop/jsb_dop.cpp index db257e9d20..d3531fc430 100644 --- a/native/cocos/bindings/dop/jsb_dop.cpp +++ b/native/cocos/bindings/dop/jsb_dop.cpp @@ -196,15 +196,22 @@ static bool jsb_ArrayPool_resize(se::State &s) { const auto &args = s.args(); size_t argc = args.size(); - if (argc == 2) { + if (argc == 3) { uint size = 0; - if (seval_to_uint(args[1], &size)) { - s.rval().setObject(arrayPool->resize(args[0].toObject(), size)); - return true; + if (!seval_to_uint(args[1], &size)) { + SE_REPORT_ERROR("jsb_ArrayPool_reize: failed to get size."); + return false; } - - SE_REPORT_ERROR("jsb_ArrayPool_reize: failed to resize array"); - return false; + + uint index = 0; + if (!seval_to_uint(args[2], &index)) { + SE_REPORT_ERROR("jsb_ArrayPool_reize: failed to get index."); + return false; + } else { + s.rval().setObject(arrayPool->resize(args[0].toObject(), size, index)); + } + + return true; } SE_REPORT_ERROR("wrong number of arguments: %d", (int)argc);