Squash commits

Author: halx99

3rdparty/CMakeLists.txt

@@ -354,6 +354,8 @@ if((WINDOWS AND NOT WINRT) OR MACOSX OR LINUX)
     list(APPEND _glfw_options "GLFW_BUILD_X11 ON")
     if(AX_ENABLE_WAYLAND)
       list(APPEND _glfw_options "GLFW_BUILD_WAYLAND ON")
+    else()
+      list(APPEND _glfw_options "GLFW_BUILD_WAYLAND OFF")
     endif()
   endif()
   ax_add_3rd(glfw OPTIONS ${_glfw_options})

CMakeOptions.md

@@ -11,7 +11,7 @@
   - AX_ENABLE_3D: whether to enable 3D support, default: `TRUE`
   - AX_ENABLE_PHYSICS_3D: whether to enable physics3d support, default: `TRUE`
   - AX_ENABLE_NAVMESH: whether to enable NavMesh support default: `TRUE`
-  - AX_ENABLE_MEDIA: whether to enable media support, default: `TRUE`
+  - AX_ENABLE_VIDEO: whether to enable video player, default: `TRUE`
   - AX_ENABLE_AUDIO: whether to enable audio support, default: `TRUE`
   - AX_ENABLE_CONSOLE: whether to enable debug tool console support, default: `TRUE`
   - AX_ENABLE_OPUS: whether to enable audio engine play .opus files support, default: `TRUE`

INFRA.md

@@ -3,7 +3,7 @@
 ## Microsoft.Windows.CppWinRT
 
 - [![nuget](https://img.shields.io/nuget/v/Microsoft.Windows.CppWinRT?label=Upstream)](https://www.nuget.org/packages/Microsoft.Windows.CppWinRT)
-- Version: 2.0.250303.1
+- Version: 3.0.260520.1
 - License: MIT
 - Platform: WinRT/WinUWP
 - Manged by: `cmake/Modules/AXConfigDefine.cmake`

axmol/2d/CMakeLists.txt

@@ -29,7 +29,6 @@ set(_AX_2D_HEADER
   2d/ClippingRectangleNode.h
   2d/ActionEase.h
   2d/ProtectedNode.h
-  2d/TextFieldTTF.h
   2d/AnimationCache.h
   2d/FastTMXLayer.h
   2d/FontAtlasCache.h
@@ -116,7 +115,6 @@ set(_AX_2D_SRC
   2d/SpriteFrameCache.cpp
   2d/SpriteFrame.cpp
   2d/AutoPolygon.cpp
-  2d/TextFieldTTF.cpp
   2d/TileMapAtlas.cpp
 
   # 2d/TMXLayer.cpp

axmol/2d/ClippingRectangleNode.cpp

@@ -79,7 +79,7 @@ void ClippingRectangleNode::onBeforeVisitScissor()
         }
 
         const Point pos        = convertToWorldSpace(Point(_clippingRegion.origin.x, _clippingRegion.origin.y));
-        RenderView* renderView = _director->getRenderView();
+        auto renderView = _director->getRenderView();
         renderView->setScissorInPoints(pos.x, pos.y, _clippingRegion.size.width * scaleX,
                                        _clippingRegion.size.height * scaleY);
     }

axmol/2d/Label.cpp

@@ -50,6 +50,7 @@
 #include "axmol/renderer/Shaders.h"
 #include "axmol/rhi/ProgramState.h"
 #include "axmol/renderer/ProgramStateRegistry.h"
+#include "yasio/tlx/string_view.hpp"
 
 namespace ax
 {
@@ -227,11 +228,31 @@ std::array<CustomCommand*, 3> Label::BatchCommand::getCommandArray()
 
 Label* Label::create()
 {
-    auto ret = new Label;
+    auto ret = new Label();
     ret->autorelease();
     return ret;
 }
 
+Label* Label::create(std::string_view text, std::string_view fontName, float fontSize)
+{
+    if (FileUtils::getInstance()->isFileExist(fontName))
+    {
+        if (tlx::ic::ends_with(fontName, ".fnt"))
+        {
+            return Label::createWithBMFont(fontName, text);
+        }
+        else
+        {
+            TTFConfig config(fontName, fontSize);
+            return Label::createWithTTF(config, text);
+        }
+    }
+    else
+    {
+        return Label::createWithSystemFont(text, fontName, fontSize);
+    }
+}
+
 Label* Label::createWithSystemFont(std::string_view text,
                                    std::string_view font,
                                    float fontSize,
@@ -392,6 +413,31 @@ Label* Label::createWithCharMap(std::string_view charMapFile, int itemWidth, int
     return nullptr;
 }
 
+void Label::setFontInfo(std::string_view fontName, float fontSize)
+{
+    auto prevLableType = _currentLabelType;
+    if (FileUtils::getInstance()->isFileExist(fontName))
+    {
+        if (tlx::ic::ends_with(fontName, ".fnt"sv))
+        {
+            setBMFontFilePath(fontName);
+        }
+        else
+        {
+            TTFConfig ttfConfig(fontName, fontSize, GlyphCollection::DYNAMIC);
+            setTTFConfig(ttfConfig);
+        }
+    }
+    else
+    {
+        setSystemFontName(fontName);
+        setSystemFontSize(fontSize);
+
+        if (prevLableType == LabelType::STRING_TEXTURE)
+            requestSystemFontRefresh();
+    }
+}
+
 bool Label::setCharMap(std::string_view plistFile)
 {
     auto newAtlas = FontAtlasCache::getFontAtlasCharMap(plistFile);
@@ -569,7 +615,6 @@ void Label::reset()
     _currLabelEffect  = LabelEffect::NORMAL;
     _contentDirty     = false;
     _numberOfLines    = 0;
-    _lengthOfString   = 0;
     _utf32Text.clear();
     _utf8Text.clear();
 
@@ -907,15 +952,19 @@ bool Label::setBMFontFilePath(std::string_view bmfontFilePath, std::string_view
 
 void Label::setString(std::string_view text)
 {
-    if (text.compare(_utf8Text))
+    if (text != _utf8Text)
     {
-        _utf8Text     = text;
-        _contentDirty = true;
-
         std::u32string utf32String;
-        if (text_utils::UTF8ToUTF32(_utf8Text, utf32String))
+        if (text_utils::UTF8ToUTF32(text, utf32String))
         {
+            _utf8Text  = text;
             _utf32Text = utf32String;
+
+            _contentDirty = true;
+        }
+        else
+        {
+            AXLOGE("Label: setString() - Invalid utf8 text: {}", text);
         }
     }
 }
@@ -1006,7 +1055,7 @@ void Label::updateLabelLetters()
             letterIndex  = it->first;
             letterSprite = (LabelLetter*)it->second;
 
-            if (letterIndex >= _lengthOfString)
+            if (letterIndex >= getCharCount())
             {
                 Node::removeChild(letterSprite, true);
                 it = _letters.erase(it);
@@ -1102,7 +1151,6 @@ void Label::alignText()
 
 bool Label::tryTextPlacement(float fontSize)
 {
-    _lengthOfString    = 0;
     _textDesiredHeight = 0.f;
     _linesWidth.clear();
 
@@ -1212,7 +1260,7 @@ bool Label::updateQuads()
         batchNode->getTextureAtlas()->removeAllQuads();
     }
 
-    for (int ctr = 0; ctr < _lengthOfString; ++ctr)
+    for (int ctr = 0; ctr < getCharCount(); ++ctr)
     {
         auto& letterInfo = _lettersInfo[ctr];
         if (letterInfo.valid)
@@ -2066,7 +2114,7 @@ void Label::updateEffectUniforms(BatchCommand& batch,
 
 void Label::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
-    if (_batchNodes.empty() || _lengthOfString <= 0)
+    if (_batchNodes.empty() || _utf32Text.empty())
     {
         return;
     }
@@ -2297,7 +2345,7 @@ Sprite* Label::getLetter(int letterIndex)
             updateContent();
         }
 
-        if (_textSprite == nullptr && letterIndex < _lengthOfString)
+        if (_textSprite == nullptr && letterIndex < getCharCount())
         {
             const auto& letterInfo = _lettersInfo[letterIndex];
             if (!letterInfo.valid || letterInfo.atlasIndex < 0)
@@ -2424,25 +2472,24 @@ void Label::computeStringNumLines()
     _numberOfLines = quantityOfLines;
 }
 
-int Label::getStringNumLines()
+int Label::getLineCount() const
 {
     if (_contentDirty)
     {
-        updateContent();
+        const_cast<Label*>(this)->updateContent();
     }
 
     if (_currentLabelType == LabelType::STRING_TEXTURE)
     {
-        computeStringNumLines();
+        const_cast<Label*>(this)->computeStringNumLines();
     }
 
     return _numberOfLines;
 }
 
-int Label::getStringLength()
+int Label::getCharCount() const
 {
-    _lengthOfString = static_cast<int>(_utf32Text.length());
-    return _lengthOfString;
+    return static_cast<int>(_utf32Text.length());
 }
 
 // RGBA protocol
@@ -2901,7 +2948,7 @@ void Label::updateFontScale()
 
 bool Label::multilineTextWrap(bool breakOnChar, bool ignoreOverflow)
 {
-    int textLen               = getStringLength();
+    int textLen               = getCharCount();
     int lineIndex             = 0;
     float nextTokenX          = 0.f;
     float nextTokenY          = 0.f;
@@ -3119,7 +3166,7 @@ bool Label::isHorizontalClamp()
 {
     bool letterClamp = false;
 
-    for (int ctr = 0; ctr < _lengthOfString; ++ctr)
+    for (int ctr = 0; ctr < getCharCount(); ++ctr)
     {
         if (_lettersInfo[ctr].valid)
         {

axmol/2d/Label.h

@@ -148,6 +148,31 @@ class AX_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      */
     static Label* create();
 
+    /**
+     * @brief Create a Label with automatic font type detection.
+     *
+     * This unified factory method creates a Label using the given text and font name.
+     * The fontName parameter can be:
+     * - A TTF font file path (e.g. "fonts/arial.ttf")
+     * - A system font name (e.g. "Arial", "Helvetica")
+     * - A BMFont file path (e.g. "fonts/myfont.fnt")
+     *
+     * Internally, the method will:
+     * - Use createWithBMFont() if fontName ends with ".fnt"
+     * - Use createWithTTF() if fontName exists as a TTF file
+     * - Otherwise, fall back to createWithSystemFont()
+     *
+     * @param text The text string to render.
+     * @param fontName The font resource identifier (TTF path, system font name, or BMFont path).
+     * @param fontSize The font size in points.
+     * @return A new Label instance, or nullptr if creation fails.
+     *
+     * @note This method simplifies font handling by providing a single entry point.
+     *       Specific createWithTTF(), createWithSystemFont(), and createWithBMFont()
+     *       methods remain available for explicit control.
+     */
+    static Label* create(std::string_view text, std::string_view fontName, float fontSize);
+
     /**
      * Allocates and initializes a Label, base on platform-dependent API.
      *
@@ -297,6 +322,25 @@ class AX_DLL Label : public Node, public LabelProtocol, public BlendProtocol
     /// @{
     /// @name Font methods
 
+    /**
+     * @brief Set font information for the Label.
+     *
+     * This method updates the Label's font using the given fontName and fontSize.
+     * The fontName parameter can be:
+     * - A TTF font file path (e.g. "fonts/arial.ttf")
+     * - A system font name (e.g. "Arial", "Helvetica")
+     * - A BMFont file path (e.g. "fonts/myfont.fnt")
+     *
+     * Internally, the method will:
+     * - Use BMFont if fontName ends with ".fnt"
+     * - Use TTF if fontName exists as a TTF file
+     * - Otherwise, fall back to system font
+     *
+     * @param fontName The font resource identifier (TTF path, system font name, or BMFont path).
+     * @param fontSize The font size in points.
+     */
+    void setFontInfo(std::string_view fontName, float fontSize);
+
     /**
      * Sets a new TTF configuration to Label.
      * @see `TTFConfig`
@@ -376,15 +420,26 @@ class AX_DLL Label : public Node, public LabelProtocol, public BlendProtocol
     /** Return the text the Label is currently displaying.*/
     std::string_view getString() const override { return _utf8Text; }
 
+    [[internal]] std::u32string_view getUTF32String() const { return _utf32Text; }
+
     /**
      * Return the number of lines of text.
      */
-    int getStringNumLines();
+    int getLineCount() const;
+    AX_DEPRECATED(3.0) int getStringNumLines() { return getLineCount(); }
+
+    /**
+     * @brief Returns the number of UTF-32 characters.
+     *
+     * @return int UTF-32 character count
+     */
+    int getCharCount() const;
+    AX_DEPRECATED(3.0) int getStringLength() { return getCharCount(); }
 
     /**
-     * Return length of string.
+     * Return whether the text is empty.
      */
-    int getStringLength();
+    bool isEmpty() const { return _utf32Text.empty(); }
 
     /**
      * Sets the text color of Label.
@@ -835,7 +890,6 @@ class AX_DLL Label : public Node, public LabelProtocol, public BlendProtocol
     float _glowRadius;
     float _systemFontSize;
 
-    int _lengthOfString;
     int _uniformEffectColor;
     int _uniformEffectType;  // 0: None, 1: Outline, 2: Shadow; Only used when outline is enabled.
     int _uniformTextColor;

axmol/2d/Layer.cpp

@@ -35,10 +35,10 @@ THE SOFTWARE.
 #include "axmol/renderer/Renderer.h"
 #include "axmol/base/Director.h"
 #include "axmol/base/EventDispatcher.h"
-#include "axmol/base/EventListenerTouch.h"
-#include "axmol/base/EventTouch.h"
-#include "axmol/base/EventKeyboard.h"
-#include "axmol/base/EventListenerKeyboard.h"
+#include "axmol/base/PointerEventListener.h"
+#include "axmol/base/PointerEvent.h"
+#include "axmol/base/KeyboardEvent.h"
+#include "axmol/base/KeyboardEventListener.h"
 #include "axmol/base/EventAcceleration.h"
 #include "axmol/base/EventListenerAcceleration.h"
 #include "axmol/base/text_utils.h"