Fixup

axmol-bot · halx99 · commit e9949b79bc7e · 2025-12-01T15:26:29.000+08:00
diff --git a/axmol/2d/FontAtlas.cpp b/axmol/2d/FontAtlas.cpp
@@ -319,7 +319,7 @@ bool FontAtlas::findNewCharacters(const std::u32string& u32Text)
 
     if (_letterDefinitions.empty())
     {
-        _newChars.insert(u32Text.begin(), u32Text.end()); 
+        _newChars.insert(u32Text.begin(), u32Text.end());
     }
     else
     {
diff --git a/axmol/2d/ParticleSystem.cpp b/axmol/2d/ParticleSystem.cpp
@@ -647,7 +647,7 @@ bool ParticleSystem::initWithDictionary(const ValueMap& dictionary, std::string_
                         // Director::getInstance()->getTextureCache()->addUIImage()
                         image                   = new Image();
                         const auto imageDataLen = deflated.size();
-                        bool isOK = image->initWithImageData(deflated.detach_abi(), imageDataLen, true);
+                        bool isOK               = image->initWithImageData(deflated.detach_abi(), imageDataLen, true);
                         AXASSERT(isOK, "CCParticleSystem: error init image with Data");
                         AX_BREAK_IF(!isOK);
 
diff --git a/axmol/2d/TMXXMLParser.cpp b/axmol/2d/TMXXMLParser.cpp
@@ -741,7 +741,7 @@ void TMXMapInfo::endElement(void* /*ctx*/, const char* name)
             tlx::pod_vector<uint32_t> tileGids;
             tlx::split(currentString, '\n', [&tileGids](const char* first, const char* last) {
                 tlx::split(std::string_view{first, static_cast<size_t>(last - first)}, ',',
-                                [&tileGids](const char* _first, const char* _last) {
+                           [&tileGids](const char* _first, const char* _last) {
                     unsigned int gid{0};
                     std::from_chars(_first, _last, gid);
                     tileGids.push_back(gid);
diff --git a/axmol/3d/Animation3D.cpp b/axmol/3d/Animation3D.cpp
@@ -124,9 +124,9 @@ bool Animation3D::init(const Animation3DData& data)
                 continue;
 
             tlx::resize_and_transform(iter.second.begin(), iter.second.end(), keys,
-                                        [](const auto& keyIter) { return keyIter._time; });
+                                      [](const auto& keyIter) { return keyIter._time; });
             tlx::resize_and_transform(iter.second.begin(), iter.second.end(), values,
-                                        [](const auto& keyIter) { return keyIter._key; });
+                                      [](const auto& keyIter) { return keyIter._key; });
 
             curve->translateCurve = Curve::AnimationCurveVec3::create(&keys[0], &values[0].x, (int)keys.size());
             if (curve->translateCurve)
@@ -150,9 +150,9 @@ bool Animation3D::init(const Animation3DData& data)
                 continue;
 
             tlx::resize_and_transform(iter.second.begin(), iter.second.end(), keys,
-                                        [](const auto& keyIter) { return keyIter._time; });
+                                      [](const auto& keyIter) { return keyIter._time; });
             tlx::resize_and_transform(iter.second.begin(), iter.second.end(), values,
-                                        [](const auto& keyIter) { return keyIter._key; });
+                                      [](const auto& keyIter) { return keyIter._key; });
 
             curve->rotCurve = Curve::AnimationCurveQuat::create(&keys[0], &values[0].x, (int)keys.size());
             if (curve->rotCurve)
@@ -176,9 +176,9 @@ bool Animation3D::init(const Animation3DData& data)
                 continue;
 
             tlx::resize_and_transform(iter.second.begin(), iter.second.end(), keys,
-                                        [](const auto& keyIter) { return keyIter._time; });
+                                      [](const auto& keyIter) { return keyIter._time; });
             tlx::resize_and_transform(iter.second.begin(), iter.second.end(), values,
-                                        [](const auto& keyIter) { return keyIter._key; });
+                                      [](const auto& keyIter) { return keyIter._key; });
 
             curve->scaleCurve = Curve::AnimationCurveVec3::create(&keys[0], &values[0].x, (int)keys.size());
             if (curve->scaleCurve)
diff --git a/axmol/3d/Mesh.h b/axmol/3d/Mesh.h
@@ -282,8 +282,8 @@ class AX_DLL Mesh : public Object
     void setLightUniforms(Pass* pass, Scene* scene, const Vec4& color, unsigned int lightmask);
     void bindMeshCommand();
     tlx::hash_map<NTextureData::Usage, Texture2D*> _textures;  // textures that submesh is using
-    MeshSkin* _skin;                                             // skin
-    bool _visible;                                               // is the submesh visible
+    MeshSkin* _skin;                                           // skin
+    bool _visible;                                             // is the submesh visible
 
     bool _instancing;
     rhi::Buffer* _instanceTransformBuffer;
diff --git a/axmol/3d/MeshMaterial.h b/axmol/3d/MeshMaterial.h
@@ -196,7 +196,7 @@ class MeshMaterialCache
 
 protected:
     static MeshMaterialCache* _cacheInstance;  // cache instance
-    tlx::string_map<Texture2D*> _materials;  // cached materials
+    tlx::string_map<Texture2D*> _materials;    // cached materials
 };
 
 // end of 3d group
diff --git a/axmol/3d/MeshVertexIndexData.h b/axmol/3d/MeshVertexIndexData.h
@@ -145,7 +145,7 @@ class AX_DLL MeshVertexData : public Object
 protected:
     rhi::Buffer* _vertexBuffer = nullptr;  // vertex buffer
     ssize_t _sizePerVertex     = -1;
-    Vector<MeshIndexData*> _indices;               // index data
+    Vector<MeshIndexData*> _indices;             // index data
     tlx::pod_vector<MeshVertexAttrib> _attribs;  // vertex attributes
 
     int _vertexCount = 0;  // vertex count
diff --git a/axmol/3d/Terrain.cpp b/axmol/3d/Terrain.cpp
@@ -1316,7 +1316,7 @@ void Terrain::Chunk::calculateAABB()
 {
     tlx::pod_vector<Vec3> pos;
     tlx::resize_and_transform(_originalVertices.begin(), _originalVertices.end(), pos,
-                                [](const auto& it) { return it._position; });
+                              [](const auto& it) { return it._position; });
     _aabb.updateMinMax(&pos[0], pos.size());
 }
 
diff --git a/axmol/base/Director.cpp b/axmol/base/Director.cpp
@@ -1122,7 +1122,7 @@ void Director::reset()
     MeshMaterial::releaseBuiltInMaterial();
     MeshMaterial::releaseCachedMaterial();
 #endif
-    
+
     rhi::SamplerCache::destroyInstance();
 }
 
diff --git a/axmol/base/Scheduler.cpp b/axmol/base/Scheduler.cpp
@@ -351,7 +351,7 @@ void Scheduler::priorityIn(tlx::pod_vector<SchedHandle*>& list,
 {
     auto sched = new SchedHandle(&list, callback, target, priority, paused);
     tlx::ordered_insert(list, sched,
-                         [](const SchedHandle* lhs, const SchedHandle* rhs) { return lhs->priority < rhs->priority; });
+                        [](const SchedHandle* lhs, const SchedHandle* rhs) { return lhs->priority < rhs->priority; });
 
     _schedIndexMap.emplace(target, sched);
 }
diff --git a/axmol/base/Utils.cpp b/axmol/base/Utils.cpp
@@ -848,8 +848,7 @@ AX_DLL std::string base64Encode(const void* in, size_t inlen)
          *
          */
 
-        tlx::resize_and_overrite(ret, n,
-                                   [in, inlen](char* out, size_t) { return ax::base64::encode(out, in, inlen); });
+        tlx::resize_and_overrite(ret, n, [in, inlen](char* out, size_t) { return ax::base64::encode(out, in, inlen); });
 
         return ret;
     }
diff --git a/axmol/network/HttpRequest.h b/axmol/network/HttpRequest.h
@@ -299,7 +299,7 @@ class AX_DLL HttpRequest : public ConcurrentRefCountedBase
     // properties
     Type _requestType;                 /// kHttpRequestGet, kHttpRequestPost or other enums
     std::string _url;                  /// target url that this request is sent to
-    tlx::sbyte_buffer _requestData;  /// used for POST
+    tlx::sbyte_buffer _requestData;    /// used for POST
     std::string _tag;                  /// user defined tag, to identify different requests in response callback
     ccHttpRequestCallback _pCallback;  /// C++11 style callbacks
     HttpDataCallback _pDataCallback;
diff --git a/axmol/platform/FileUtils.cpp b/axmol/platform/FileUtils.cpp
@@ -856,10 +856,10 @@ bool FileUtils::isAbsolutePathInternal(std::string_view path)
 #if defined(_WIN32)
     // see also: https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN
     return ((path.length() > 2 && ((raw[0] >= 'a' && raw[0] <= 'z') || (raw[0] >= 'A' && raw[0] <= 'Z')) &&
-             raw[1] == ':')                         // Normal absolute path
+             raw[1] == ':')                       // Normal absolute path
             || tlx::starts_with(path, R"(\\?\)")  // Win32 File Namespaces for Long Path
             || tlx::starts_with(path, R"(\\.\)")  // Win32 Device Namespaces for device
-            || (raw[0] == '/' || raw[0] == '\\')    // Current disk drive
+            || (raw[0] == '/' || raw[0] == '\\')  // Current disk drive
     );
 #else
     return (path.length() > 0 && raw[0] == '/');
diff --git a/axmol/platform/FileUtils.h b/axmol/platform/FileUtils.h
@@ -79,7 +79,7 @@ class ResizableBufferAdapter : public ResizableBuffer
             tlx::resize_and_overrite(*_cont, num_of_bytes, std::move(op));
         else
             tlx::resize_and_overrite(*_cont, count_element(num_of_bytes),
-                                       [op_ = std::move(op)](void* out, size_t count) {
+                                     [op_ = std::move(op)](void* out, size_t count) {
                 const auto num_of_bytes = op_(out, count * element_size);
                 return count_element(num_of_bytes);
             });
diff --git a/axmol/platform/android/jni/JniHelper.h b/axmol/platform/android/jni/JniHelper.h
@@ -270,9 +270,7 @@ class AX_DLL JniHelper
     @return tlx::pod_vector
     */
     template <typename... Ts>
-    static tlx::pod_vector<float> callStaticFloatArrayMethod(const char* className,
-                                                               const char* methodName,
-                                                               Ts&&... xs)
+    static tlx::pod_vector<float> callStaticFloatArrayMethod(const char* className, const char* methodName, Ts&&... xs)
     {
         ax::JniMethodInfo t;
         const char* signature = jni::TypeSignature<jni::Array<jfloat>(std::decay_t<Ts>...)>{}();
@@ -313,9 +311,7 @@ class AX_DLL JniHelper
     @return tlx::pod_vector
     */
     template <typename... Ts>
-    static tlx::pod_vector<int32_t> callStaticIntArrayMethod(const char* className,
-                                                               const char* methodName,
-                                                               Ts&&... xs)
+    static tlx::pod_vector<int32_t> callStaticIntArrayMethod(const char* className, const char* methodName, Ts&&... xs)
     {
         ax::JniMethodInfo t;
         const char* signature = jni::TypeSignature<jni::Array<jint>(std::decay_t<Ts>...)>{}();
diff --git a/axmol/platform/win32/FileUtils-win32.cpp b/axmol/platform/win32/FileUtils-win32.cpp
@@ -35,8 +35,7 @@ THE SOFTWARE.
 #include <sys/stat.h>
 
 #include "ntcvt/ntcvt.hpp"
-
-#include "axmol/tlx/utility.hpp"
+#include "axmol/tlx/split.hpp"
 
 namespace ax
 {
@@ -274,7 +273,7 @@ bool FileUtilsWin32::createDirectories(std::string_view dirPath) const
     if ((GetFileAttributesW(path.c_str())) == INVALID_FILE_ATTRIBUTES)
     {
         tlx::split_path(&path.front(), [](wchar_t* ptr) { return *ptr != '\0'; },
-                            [&dirPath, &fail](const wchar_t* subpath) {
+                        [&dirPath, &fail](const wchar_t* subpath) {
             auto attribs = GetFileAttributesW(subpath);
             if (attribs == INVALID_FILE_ATTRIBUTES)
             {
diff --git a/axmol/platform/winrt/FileUtilsWinRT.cpp b/axmol/platform/winrt/FileUtilsWinRT.cpp
@@ -29,6 +29,7 @@ THE SOFTWARE.
 #include "axmol/platform/winrt/WinRTUtils.h"
 #include "axmol/platform/Common.h"
 #include "ntcvt/ntcvt.hpp"
+#include "axmol/tlx/split.hpp"
 
 #include <winrt/Windows.Storage.h>
 #include <winrt/Windows.ApplicationModel.h>
@@ -165,7 +166,7 @@ bool FileUtilsWinRT::createDirectories(std::string_view dirPath) const
     if ((GetFileAttributesW(path.c_str())) == INVALID_FILE_ATTRIBUTES)
     {
         tlx::split_path(&path.front(), [](wchar_t* ptr) { return *ptr != '\0'; },
-                            [&dirPath, &fail](const wchar_t* subpath) {
+                        [&dirPath, &fail](const wchar_t* subpath) {
             auto attribs = GetFileAttributesW(subpath);
             if (attribs == INVALID_FILE_ATTRIBUTES)
             {
diff --git a/axmol/rhi/ProgramState.h b/axmol/rhi/ProgramState.h
@@ -171,10 +171,7 @@ class AX_DLL ProgramState : public Object
         return _program->getVertexInputDesc(name);
     }
 
-    const tlx::string_map<VertexInputDesc>& getActiveVertexInputs() const
-    {
-        return _program->getActiveVertexInputs();
-    }
+    const tlx::string_map<VertexInputDesc>& getActiveVertexInputs() const { return _program->getActiveVertexInputs(); }
 
     /*
      * Gets the inmutable vertex layout from _program
diff --git a/axmol/ui/UIRichText.cpp b/axmol/ui/UIRichText.cpp
@@ -1182,7 +1182,7 @@ void MyXMLVisitor::setTagDescription(std::string_view tag,
 {
     // MyXMLVisitor::_tagTables[tag] = {isFontElement, std::move(handleVisitEnter), std::move(handleVisitExit)};
     tlx::set_item(MyXMLVisitor::_tagTables, tag,
-                    TagBehavior{isFontElement, std::move(handleVisitEnter), std::move(handleVisitExit)});
+                  TagBehavior{isFontElement, std::move(handleVisitEnter), std::move(handleVisitExit)});
 }
 
 void MyXMLVisitor::removeTagDescription(std::string_view tag)
diff --git a/extensions/Particle3D/src/Particle3D/PU/PUScriptCompiler.cpp b/extensions/Particle3D/src/Particle3D/PU/PUScriptCompiler.cpp
@@ -190,7 +190,7 @@ PUScriptCompiler::~PUScriptCompiler()
 }
 
 tlx::string_map<PUAbstractNodeList>::iterator PUScriptCompiler::compile(const PUConcreteNodeList& nodes,
-                                                                          std::string_view file)
+                                                                        std::string_view file)
 {
     if (nodes.empty())
         return _compiledScripts.end();
diff --git a/extensions/cocostudio/src/cocostudio/SGUIReader.cpp b/extensions/cocostudio/src/cocostudio/SGUIReader.cpp
@@ -1645,10 +1645,10 @@ void WidgetPropertiesReader0300::setPropsForAllCustomWidgetFromJsonDictionary(st
     GUIReader* guiReader = GUIReader::getInstance();
 
     tlx::string_map<Object*>* object_map = guiReader->getParseObjectMap();
-    Object* object                         = (*object_map)[classType];
+    Object* object                       = (*object_map)[classType];
 
     tlx::string_map<SEL_ParseEvent>* selector_map = guiReader->getParseCallBackMap();
-    SEL_ParseEvent selector                         = (*selector_map)[classType];
+    SEL_ParseEvent selector                       = (*selector_map)[classType];
 
     if (object && selector)
     {
diff --git a/tests/cpp-tests/Source/NetworkTest/HttpClientTest/HttpClientTest.cpp b/tests/cpp-tests/Source/NetworkTest/HttpClientTest/HttpClientTest.cpp
diff --git a/tests/unit-tests/Source/axmol/tlx/ContainerTests.cpp b/tests/unit-tests/Source/axmol/tlx/ContainerTests.cpp

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ bool FontAtlas::findNewCharacters(const std::u32string& u32Text)`
`319`	`319`
`320`	`320`	`if (_letterDefinitions.empty())`
`321`	`321`	`{`
`322`		`- _newChars.insert(u32Text.begin(), u32Text.end());`
	`322`	`+ _newChars.insert(u32Text.begin(), u32Text.end());`
`323`	`323`	`}`
`324`	`324`	`else`
`325`	`325`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1316,7 +1316,7 @@ void Terrain::Chunk::calculateAABB()`
`1316`	`1316`	`{`
`1317`	`1317`	`tlx::pod_vector<Vec3> pos;`
`1318`	`1318`	`tlx::resize_and_transform(_originalVertices.begin(), _originalVertices.end(), pos,`
`1319`		`- [](const auto& it) { return it._position; });`
	`1319`	`+ [](const auto& it) { return it._position; });`
`1320`	`1320`	`_aabb.updateMinMax(&pos[0], pos.size());`
`1321`	`1321`	`}`
`1322`	`1322`
Original file line number	Diff line number	Diff line change
`@@ -1122,7 +1122,7 @@ void Director::reset()`
`1122`	`1122`	`MeshMaterial::releaseBuiltInMaterial();`
`1123`	`1123`	`MeshMaterial::releaseCachedMaterial();`
`1124`	`1124`	`#endif`
`1125`		`-`
	`1125`	`+`
`1126`	`1126`	`rhi::SamplerCache::destroyInstance();`
`1127`	`1127`	`}`
`1128`	`1128`
Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ void Scheduler::priorityIn(tlx::pod_vector<SchedHandle*>& list,`
`351`	`351`	`{`
`352`	`352`	`auto sched = new SchedHandle(&list, callback, target, priority, paused);`
`353`	`353`	`tlx::ordered_insert(list, sched,`
`354`		`- [](const SchedHandle* lhs, const SchedHandle* rhs) { return lhs->priority < rhs->priority; });`
	`354`	`+ [](const SchedHandle* lhs, const SchedHandle* rhs) { return lhs->priority < rhs->priority; });`
`355`	`355`
`356`	`356`	`_schedIndexMap.emplace(target, sched);`
`357`	`357`	`}`