Merge branch 'release/2.x' into dev/v3

Author: halx99

CHANGELOG.md

@@ -1,3 +1,48 @@
+# axmol-2.8.1 ?? 2025
+
+## Bug Fixes
+
+- **Fix a regression introduced by 2.8.0 that improper Content-Length setting in HTTP requests, see #2686** by @halx99
+- Fix compile error when using AX_CORE_PROFILE option by @martinking71 in [#2677](https://github.com/axmolengine/axmol/pull/2677)
+- Fix lua-tests PhysicsTest not work by @halx99
+- Fix missing processor endif in platform/mac/GL-mac.h by @halx99
+- Fix package name for lua-tests, live2d-tests by @halx99
+- Fix AccelerometerTest of lua-tests not work by @halx99
+- Fix wasm downloader by @AlexandreK38 in [#2676](https://github.com/axmolengine/axmol/pull/2676)
+
+## Deprecated
+
+- Mark Director::setGLDefaultValues as deprecated; use setRenderDefaults instead by @halx99
+- Mark messageBox as deprecated; use showAlert instead by @halx99
+
+## Improvements
+
+- **Revert DrawNode color param to Color4F to fix Lua test issues** by @halx99
+- Add API ax::showAlert by @halx99
+- Add API HttpResponse::getStatusText by @halx99
+- Remove entries for non-existent Lua test cases by @halx99
+- Fix incorrect fmt::format format string by @halx99
+- Remove "CC" from the menu entries (cpp-/lua-tests) by @aismann in [#2688](https://github.com/axmolengine/axmol/pull/2688)
+- Remove unnecessary Lua files: LayerEx.lua, DrawPrimitives.lua.lua by @halx99
+- Use lua length operator `#` instead `table.getn` in CocoStudio.lua by @halx99
+- Update url of CurlTeset by @halx99
+- Ensure lua-tests RenderTextureTest case work as expected by @halx99
+- Add API PointArray::clear() by @aismann in [#2692](https://github.com/axmolengine/axmol/pull/2692)
+
+## Notes
+
+- **Revert DrawNode color parameter type**
+
+  **Reason**:  
+  In axmol-2.2.0, the `DrawNode` color parameter was changed from `Color4F` to `Color4B`. This change prevented certain Lua binding test cases from detecting color updates correctly.
+
+  **Impact**:  
+  As a result, some Lua tests failed to produce the expected rendering behavior, leading to inconsistent test outcomes.
+
+  **Solution**:  
+  The color parameter has been reverted to `Color4F`. Since `DrawNode` internally already uses `Color4F` to pass color data to the GPU, this change restores expected Lua test behavior without any noticeable performance loss.
+
+
 # axmol-2.8.0 Sep.1 2025
 
 ## Bug fixes

axmol/2d/ActionCatmullRom.cpp

@@ -123,6 +123,11 @@ void PointArray::removeControlPointAtIndex(ssize_t index)
     _controlPoints.erase(iter);
 }
 
+void PointArray::clear()
+{
+    _controlPoints.clear();
+}
+
 ssize_t PointArray::count() const
 {
     return _controlPoints.size();

axmol/2d/ActionCatmullRom.h

@@ -112,6 +112,11 @@ class AX_DLL PointArray : public Object, public Clonable
      */
     void removeControlPointAtIndex(ssize_t index);
 
+     /** Remove all control points.
+     *
+     */
+    void clear();
+
     /** Returns the number of objects of the control point array.
      *
      * @return The number of objects of the control point array.

axmol/2d/FontFNT.cpp

@@ -127,9 +127,9 @@ BMFontConfiguration::~BMFontConfiguration()
 
 std::string BMFontConfiguration::description() const
 {
-    return fmt::format("<BMFontConfiguration = " AX_FORMAT_PRINTF_SIZE_T " | Glphys:{} Kernings:{} | Image = {}>",
-                       (size_t)this, static_cast<int>(_fontDefDictionary.size()),
-                       static_cast<int>(_kerningDictionary.size()), _atlasName);
+    return fmt::format("<BMFontConfiguration = {} | Glphys:{} Kernings:{} | Image = {}>", fmt::ptr(this),
+                       static_cast<int>(_fontDefDictionary.size()), static_cast<int>(_kerningDictionary.size()),
+                       _atlasName);
 }
 
 void BMFontConfiguration::purgeKerningDictionary()

axmol/audio/AudioDecoderEXT.mm

@@ -52,28 +52,28 @@ of this software and associated documentation files (the "Software"), to deal
         BREAK_IF_ERR_LOG(fullPath.empty(), "Invalid path!");
 
         _fileStream = FileUtils::getInstance()->openFileStream(fullPath, IFileStream::Mode::READ);
-        BREAK_IF_ERR_LOG(_fileStream == nullptr, "FileUtils::openFileStream FAILED for file: %s", fullPath.data());
+        BREAK_IF_ERR_LOG(_fileStream == nullptr, "FileUtils::openFileStream FAILED for file: {}", fullPath);
         if (_fileStream)
         {
             _streamSize = _fileStream->size();  // cache the stream size
         }
 
         OSStatus status = AudioFileOpenWithCallbacks(this, &AudioDecoderEXT::readCallback, nullptr,
                                                      &AudioDecoderEXT::getSizeCallback, nullptr, 0, &_audioFileId);
-        BREAK_IF_ERR_LOG(status != noErr, "AudioFileOpenWithCallbacks FAILED, Error = %d", (int)status);
+        BREAK_IF_ERR_LOG(status != noErr, "AudioFileOpenWithCallbacks FAILED, Error = {}", (int)status);
 
         status = ExtAudioFileWrapAudioFileID(_audioFileId, false, &_extRef);
-        BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileWrapAudioFileID FAILED, Error = %d", (int)status);
+        BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileWrapAudioFileID FAILED, Error = {}", (int)status);
 
-        BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileOpenURL FAILED, Error = %d", (int)status);
+        BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileOpenURL FAILED, Error = {}", (int)status);
 
         AudioStreamBasicDescription fileFormat;
         UInt32 propertySize = sizeof(fileFormat);
 
         // Get the audio data format
         status = ExtAudioFileGetProperty(_extRef, kExtAudioFileProperty_FileDataFormat, &propertySize, &fileFormat);
         BREAK_IF_ERR_LOG(status != noErr,
-                         "ExtAudioFileGetProperty(kExtAudioFileProperty_FileDataFormat) FAILED, Error = %d",
+                         "ExtAudioFileGetProperty(kExtAudioFileProperty_FileDataFormat) FAILED, Error = {}",
                          (int)status);
         BREAK_IF_ERR_LOG(fileFormat.mChannelsPerFrame > 2, "Unsupported Format, channel count is greater than stereo!");
 
@@ -97,16 +97,16 @@ of this software and associated documentation files (the "Software"), to deal
 
         status = ExtAudioFileSetProperty(_extRef, kExtAudioFileProperty_ClientDataFormat, sizeof(_outputFormat),
                                          &_outputFormat);
-        BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileSetProperty FAILED, Error = %d", (int)status);
+        BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileSetProperty FAILED, Error = {}", (int)status);
 
         // Get the total frame count
         SInt64 totalFrames = 0;
         propertySize       = sizeof(totalFrames);
         status = ExtAudioFileGetProperty(_extRef, kExtAudioFileProperty_FileLengthFrames, &propertySize, &totalFrames);
         BREAK_IF_ERR_LOG(status != noErr,
-                         "ExtAudioFileGetProperty(kExtAudioFileProperty_FileLengthFrames) FAILED, Error = %d",
+                         "ExtAudioFileGetProperty(kExtAudioFileProperty_FileLengthFrames) FAILED, Error = {}",
                          (int)status);
-        BREAK_IF_ERR_LOG(totalFrames <= 0, "Total frames is 0, it's an invalid audio file: %s", fullPath.data());
+        BREAK_IF_ERR_LOG(totalFrames <= 0, "Total frames is 0, it's an invalid audio file: {}", fullPath);
         _totalFrames = static_cast<uint32_t>(totalFrames);
         _isOpened    = true;
 

axmol/base/Director.cpp

@@ -252,7 +252,7 @@ void Director::setDefaultValues()
     Image::setCompressedImagesHavePMA(Image::CompressedImagePMAFlag::ETC2, etc2_alpha_premultiplied);
 }
 
-void Director::setGLDefaultValues()
+void Director::setRenderDefaults()
 {
     // This method SHOULD be called only after _renderView was initialized
     AXASSERT(_renderView, "render view should not be null");

axmol/base/Director.h

@@ -395,12 +395,15 @@ class AX_DLL Director
     /** Sets the default values based on the Configuration info. */
     void setDefaultValues();
 
-    // OpenGL Helper
+    // Render Helper
 
-    /** Sets the OpenGL default values.
+    /** Sets the Render default values.
      * It will enable alpha blending, disable depth test.
      */
-    void setGLDefaultValues();
+    void setRenderDefaults();
+#ifndef AX_CORE_PROFILE
+    AX_DEPRECATED(2.9) void setGLDefaultValues() { setRenderDefaults(); }
+#endif
 
     /** Sets clear values for the color buffers,
      * value range of each element is [0.0, 1.0].

axmol/network/Downloader-wasm.cpp

@@ -37,16 +37,14 @@ static int sDownloaderCounter;
 
 struct DownloadContextEmscripten : public IDownloadContext
 {
-    explicit DownloadContextEmscripten(unsigned int id_) : id(id_), bytesReceived(0), fetch(NULL)
+    explicit DownloadContextEmscripten(emscripten_fetch_t* fetch_) : fetch(fetch_)
     {
         AXLOGD("Construct DownloadContextEmscripten: {}", fmt::ptr(this));
     }
     virtual ~DownloadContextEmscripten() { AXLOGD("Destruct DownloadContextEmscripten: {}", fmt::ptr(this)); }
 
-    int bytesReceived;
-    unsigned int id;
     emscripten_fetch_t* fetch;
-    shared_ptr<const DownloadTask> task;  // reference to DownloadTask, when task finish, release
+    shared_ptr<DownloadTask> task;  // reference to DownloadTask, when task finish, release
 };
 
 DownloaderEmscripten::DownloaderEmscripten(const DownloaderHints& hints) : _id(++sDownloaderCounter), hints(hints)
@@ -86,26 +84,26 @@ void DownloaderEmscripten::startTask(std::shared_ptr<DownloadTask>& task)
     emscripten_fetch_t* fetch = emscripten_fetch(&attr, task->requestURL.c_str());
     fetch->userData           = this;
 
-    auto context  = new DownloadContextEmscripten(fetch->id);
+    auto context  = new DownloadContextEmscripten(fetch);
     context->task = task;
 
-    AXLOGD("DownloaderEmscripten::startTask context-id: {}", context->id);
-    _taskMap.emplace(context->id, context);
+    AXLOGD("DownloaderEmscripten::startTask fetch: {}", fmt::ptr(fetch));
+    _taskMap.emplace(fetch, context);
 }
 
 void DownloaderEmscripten::onDataLoad(emscripten_fetch_t* fetch)
 {
-    unsigned int taskId = fetch->id;
-    uint64_t size       = fetch->numBytes;
-    AXLOGD("DownloaderEmscripten::onDataLoad(taskId: {}, size: {})", taskId, size);
+    int64_t size = fetch->totalBytes;
+    AXLOGD("DownloaderEmscripten::onDataLoad(fetch: {}, size: {})", fmt::ptr(fetch), size);
     DownloaderEmscripten* downloader = reinterpret_cast<DownloaderEmscripten*>(fetch->userData);
-    auto iter                        = downloader->_taskMap.find(taskId);
+    auto iter                        = downloader->_taskMap.find(fetch);
     if (downloader->_taskMap.end() == iter)
     {
-        AXLOGD("DownloaderEmscripten::onDataLoad can't find task with id: {}, size: {}", taskId, size);
+        AXLOGD("DownloaderEmscripten::onDataLoad can't find task with fetch: {}, size: {}", fmt::ptr(fetch), size);
         return;
     }
     auto context = iter->second;
+    updateTaskProgressInfo(*context->task, fetch);
     std::vector<unsigned char> buf(reinterpret_cast<const uint8_t*>(fetch->data),
                                    reinterpret_cast<const uint8_t*>(fetch->data) + size);
     emscripten_fetch_close(fetch);
@@ -119,17 +117,17 @@ void DownloaderEmscripten::onDataLoad(emscripten_fetch_t* fetch)
 
 void DownloaderEmscripten::onLoad(emscripten_fetch_t* fetch)
 {
-    unsigned int taskId = fetch->id;
-    uint64_t size       = fetch->numBytes;
-    AXLOGD("DownloaderEmscripten::onLoad(taskId: {}, size: {})", taskId, size);
+    int64_t size = fetch->totalBytes;
+    AXLOGD("DownloaderEmscripten::onLoad(fetch: {}, size: {})", fmt::ptr(fetch), size);
     DownloaderEmscripten* downloader = reinterpret_cast<DownloaderEmscripten*>(fetch->userData);
-    auto iter                        = downloader->_taskMap.find(taskId);
+    auto iter                        = downloader->_taskMap.find(fetch);
     if (downloader->_taskMap.end() == iter)
     {
-        AXLOGD("DownloaderEmscripten::onLoad can't find task with id: {}, size: {}", taskId, size);
+        AXLOGD("DownloaderEmscripten::onLoad can't find task with fetch: {}, size: {}", fmt::ptr(fetch), size);
         return;
     }
     auto context = iter->second;
+    updateTaskProgressInfo(*context->task, fetch);
     vector<unsigned char> buf;
     downloader->_taskMap.erase(iter);
 
@@ -199,43 +197,43 @@ void DownloaderEmscripten::onLoad(emscripten_fetch_t* fetch)
 
 void DownloaderEmscripten::onProgress(emscripten_fetch_t* fetch)
 {
-    uint64_t dlTotal    = fetch->totalBytes;
-    uint64_t dlNow      = fetch->dataOffset;
-    unsigned int taskId = fetch->id;
-    AXLOGD("DownloaderEmscripten::onProgress(taskId: {}, dlnow: {}, dltotal: {})", taskId, dlNow, dlTotal);
+    AXLOGD("DownloaderEmscripten::onProgress(fetch: {}, dlnow: {}, dltotal: {})", fmt::ptr(fetch), fetch->dataOffset,
+           fetch->totalBytes);
     DownloaderEmscripten* downloader = reinterpret_cast<DownloaderEmscripten*>(fetch->userData);
-    auto iter                        = downloader->_taskMap.find(taskId);
+    auto iter                        = downloader->_taskMap.find(fetch);
     if (downloader->_taskMap.end() == iter)
     {
-        AXLOGD("DownloaderEmscripten::onProgress can't find task with id: {}", taskId);
+        AXLOGD("DownloaderEmscripten::onProgress can't find task with fetch: {}", fmt::ptr(fetch));
         return;
     }
 
-    if (dlTotal == 0)
+    if (fetch->totalBytes == 0)
     {
-        AXLOGD("DownloaderEmscripten::onProgress dlTotal unknown, usually caused by unknown content-length header {}",
-               taskId);
+        AXLOGD(
+            "DownloaderEmscripten::onProgress fetch totalBytes unknown, usually caused by unknown content-length "
+            "header {}",
+            fmt::ptr(fetch));
         return;
     }
 
-    auto context           = iter->second;
-    context->bytesReceived = dlNow;
+    auto context = iter->second;
+    updateTaskProgressInfo(*context->task, fetch);
     downloader->onTaskProgress(*context->task);
 }
 
 void DownloaderEmscripten::onError(emscripten_fetch_t* fetch)
 {
-    unsigned int taskId = fetch->id;
-    AXLOGD("DownloaderEmscripten::onLoad(taskId: {})", taskId);
+    AXLOGD("DownloaderEmscripten::onLoad(fetch: {})", fmt::ptr(fetch));
     DownloaderEmscripten* downloader = reinterpret_cast<DownloaderEmscripten*>(fetch->userData);
-    auto iter                        = downloader->_taskMap.find(taskId);
+    auto iter                        = downloader->_taskMap.find(fetch);
     if (downloader->_taskMap.end() == iter)
     {
         emscripten_fetch_close(fetch);
-        AXLOGD("DownloaderEmscripten::onLoad can't find task with id: {}", taskId);
+        AXLOGD("DownloaderEmscripten::onLoad can't find task with fetch: {}", fmt::ptr(fetch));
         return;
     }
     auto context = iter->second;
+    updateTaskProgressInfo(*context->task, fetch);
     vector<unsigned char> buf;
     downloader->_taskMap.erase(iter);
     downloader->onTaskFinish(*context->task, DownloadTask::ERROR_IMPL_INTERNAL, fetch->status, fetch->statusText, buf);
@@ -244,5 +242,12 @@ void DownloaderEmscripten::onError(emscripten_fetch_t* fetch)
     context->fetch = fetch = NULL;
     context->task.reset();
 }
+
+void DownloaderEmscripten::updateTaskProgressInfo(DownloadTask& task, emscripten_fetch_t* fetch)
+{
+    task.progressInfo.bytesReceived      = fetch->numBytes;
+    task.progressInfo.totalBytesReceived = fetch->dataOffset;
+    task.progressInfo.totalBytesExpected = fetch->totalBytes;
+}
 }  // namespace network
 }  // namespace ax

axmol/network/Downloader-wasm.h

@@ -53,7 +53,7 @@ class DownloaderEmscripten : public IDownloaderImpl
 
     DownloaderHints hints;
 
-    std::unordered_map<unsigned int, DownloadContextEmscripten*> _taskMap;
+    std::unordered_map<emscripten_fetch_t*, DownloadContextEmscripten*> _taskMap;
 
     static void onError(emscripten_fetch_t* fetch);
 
@@ -62,6 +62,8 @@ class DownloaderEmscripten : public IDownloaderImpl
     static void onDataLoad(emscripten_fetch_t* fetch);
 
     static void onLoad(emscripten_fetch_t* fetch);
+
+    static void updateTaskProgressInfo(DownloadTask& task, emscripten_fetch_t* fetch);
 };
 
 }  // namespace network

axmol/network/HttpClient.cpp

@@ -361,7 +361,7 @@ void HttpClient::handleNetworkEvent(yasio::io_event* event)
                 auto requestDataSize = request->getRequestDataSize();
                 char buf[128];
                 auto strConentLen =
-                    fmt::format_to_z(buf, "Content-Length: %d\r\n\r\n", static_cast<int>(requestDataSize));
+                    fmt::format_to_z(buf, "Content-Length: {}\r\n\r\n", static_cast<int>(requestDataSize));
                 obs.write_bytes(strConentLen);
 
                 if (requestData && requestDataSize > 0)