Merge branch 'release/2.x' into dev

Author: halx99

1k/install-pwsh.sh

@@ -12,7 +12,7 @@ mkdir -p $cacheDir
 
 pwsh_ver=$1
 if [ "$pwsh_ver" = "" ] ; then
-    pwsh_ver='7.5.2'
+    pwsh_ver='7.5.3'
 fi
 
 pwsh_min_ver=$2

CHANGELOG.md

@@ -15,15 +15,19 @@
 - Add new API `EventKeyboard::isRepeat` by @halx99 in [#2735](https://github.com/axmolengine/axmol/pull/2735)
 - Add new API `ZipFile::createWithData` and mark `ZipFile::createWithBuffer` as deprecated by @halx99
 - Enhance Base64 decoder to skip whitespace/newlines and prevent premature termination by @halx99
+- Add Device::resolveOrientation and compact resolution logic by @halx99 in [#2792](https://github.com/axmolengine/axmol/pull/2792)
 
 ## Bug fixes
 
 - Fix `ui::MediaPlayer` may crash on Apple platforms by @halx99 in [#2704](https://github.com/axmolengine/axmol/pull/2704)
 - Fix occasional missing Android assets in AAB build by @paulocoutinhox in [#2713](https://github.com/axmolengine/axmol/pull/2713)
 - Fix format specifiers in logging calls by @rh101 in [#2749](https://github.com/axmolengine/axmol/pull/2749)
 
+
 ## Improvements
 
+- Improve ios EditBox orientation handling with keyboard by @halx99 in [#2791](https://github.com/axmolengine/axmol/pull/2791) and [#2795](https://github.com/axmolengine/axmol/pull/2795)
+- Add support for extracting the previous scene from the scene stack by @rh101 in [#2793](https://github.com/axmolengine/axmol/pull/2793)
 - Destroy `ScriptEngine` instance before `_scheduler` to respect dependency by @halx99
 - Fix SpineTest aim y-axis by @halx99
 - Replace deprecated calls with new API in engine by @halx99
@@ -32,6 +36,7 @@
 - Remove non-existent yaml-cpp from template cmake modules by @halx99
 - Remove CI pull-request trigger event: `ready_for_review` by @halx99
 - Update kcp to resolve cmake error by @halx99
+- Dispatch applicationScreenSizeChanged when layoutSubviews on ios by @halx99
 
 ## SDK & Tools updates
 

axmol/2d/ParticleSystem.cpp

@@ -2305,14 +2305,14 @@ void ParticleEmissionMaskCache::bakeEmissionMask(std::string_view maskId,
             if (inbetweenSamples > 1)
             {
                 float a = data[(y * w + x) * 4 + 3] / 255.0F;
-                if (a >= alphaThreshold && !inverted || a < alphaThreshold && inverted)
+                if ((a >= alphaThreshold && !inverted) || (a < alphaThreshold && inverted))
                     for (float i = 0; i < 1.0F; i += 1.0F / inbetweenSamples)
                         points.emplace_back(Vec2{float(x + i), float(h - y + i)});
             }
             else
             {
                 float a = data[(y * w + x) * 4 + 3] / 255.0F;
-                if (a >= alphaThreshold && !inverted || a < alphaThreshold && inverted)
+                if ((a >= alphaThreshold && !inverted) || (a < alphaThreshold && inverted))
                     points.emplace_back(Vec2{float(x), float(h - y)});
             }
         }

axmol/base/Director.cpp

@@ -963,6 +963,39 @@ void Director::popToSceneStackLevel(int level)
     _sendCleanupToScene = true;
 }
 
+Scene* Director::popPreviousSceneOut()
+{
+    if (_nextScene)
+    {
+        return nullptr;
+    }
+
+    const auto numScenes = _scenesStack.size();
+
+    if (numScenes < 2)
+    {
+        return nullptr;
+    }
+
+    const auto previousSceneIndex = numScenes - 2;
+
+    auto previousScene = _scenesStack.at(previousSceneIndex);
+    previousScene->retain();
+    previousScene->autorelease();
+
+#if AX_ENABLE_GC_FOR_NATIVE_OBJECTS
+    auto sEngine = ScriptEngineManager::getInstance()->getScriptEngine();
+    if (sEngine)
+    {
+        sEngine->releaseScriptObject(this, previousScene);
+    }
+#endif  // AX_ENABLE_GC_FOR_NATIVE_OBJECTS
+
+    _scenesStack.erase(previousSceneIndex);
+
+    return previousScene;
+}
+
 void Director::end()
 {
     _cleanupDirectorInNextLoop = true;

axmol/base/Director.h

@@ -321,6 +321,15 @@ class AX_DLL Director
      */
     void replaceScene(Scene* scene);
 
+    /** Removes the previous scene from the stack if it exists, and returns it
+     * If there are less than 2 scenes in the stack, or if there is a 
+     * scene switch about to occur, then this call would be invalid, and a nullptr
+     * will be returned.
+     *
+     * Returns previous scene or nullptr if invalid
+     */
+    Scene* popPreviousSceneOut();
+
     /** Ends the execution, releases the running scene.
      * @lua endToLua
      */

axmol/platform/CMakeLists.txt

@@ -78,7 +78,7 @@ elseif(APPLE)
       ${_AX_PLATFORM_SPECIFIC_HEADER}
       platform/ios/Application-ios.h
       platform/ios/DirectorCaller-ios.h
-      platform/ios/EARenderView-ios.h
+      platform/ios/RenderHostView-ios.h
       platform/ios/RenderViewImpl-ios.h
       platform/ios/StdC-ios.h
       platform/ios/InputView-ios.h
@@ -91,7 +91,7 @@ elseif(APPLE)
       platform/ios/Common-ios.mm
       platform/ios/Device-ios.mm
       platform/ios/DirectorCaller-ios.mm
-      platform/ios/EARenderView-ios.mm
+      platform/ios/RenderHostView-ios.mm
       platform/ios/RenderViewImpl-ios.mm
       platform/ios/Image-ios.mm
       platform/ios/InputView-ios.mm

axmol/platform/Device.h

@@ -267,6 +267,32 @@ class AX_DLL Device
      */
     static Orientation getPhysicalOrientation();
 
+    /**
+     * Resolve the orientation of the application window.
+     *
+     * This method combines three sources of information:
+     *   1. Supported orientations (from getSupportedOrientations)
+     *   2. Preferred orientation (from getPreferredOrientation)
+     *   3. Current physical device orientation (from getPhysicalOrientation)
+     *
+     * Resolution rules:
+     *   - If the preferred orientation is a concrete value (Portrait, Landscape, etc.)
+     *     and is included in the supported mask, it will be used.
+     *   - If the preferred orientation is a sensor-based value (SensorPortrait,
+     *     SensorLandscape, Sensor, FullSensor), the physical orientation is used
+     *     if it is supported; otherwise a fallback orientation is chosen.
+     *   - If no valid orientation can be resolved, the first available orientation
+     *     from the supported mask is used as a fallback.
+     *
+     * The returned Orientation is guaranteed to be compatible with the supported
+     * orientation mask, and can be used by RenderViewImpl-ios to compute the
+     * logical screen size and viewport before app->run().
+     *
+     * @return Orientation  The resolved final orientation for the application.
+     * @since axmol-2.9.0
+     */
+    static Orientation resolveOrientation();
+
 #pragma endregion Orientation control support
 
     /**

axmol/platform/android/Device-android.cpp

@@ -250,6 +250,11 @@ Device::Orientation Device::getPhysicalOrientation()
     return static_cast<Device::Orientation>(orientation);
 }
 
+Device::Orientation Device::resolveOrientation()
+{
+    return s_preferredOrientation;
+}
+
 }  // namespace ax
 
 // this method is called by BitmapHelper

axmol/platform/desktop/Device-desktop.cpp

@@ -64,4 +64,9 @@ Device::Orientation Device::getPhysicalOrientation()
     return Orientation::Unknown;
 }
 
+Device::Orientation Device::resolveOrientation()
+{
+    return Orientation::Unknown;
+}
+
 }  // namespace ax

axmol/platform/ios/AxmolViewController.mm

@@ -23,7 +23,7 @@ of this software and associated documentation files (the "Software"), to deal
  ****************************************************************************/
 
 #import "axmol/platform/ios/AxmolViewController.h"
-#import "axmol/platform/ios/EARenderView-ios.h"
+#import "axmol/platform/ios/RenderHostView-ios.h"
 #include "axmol/platform/Device.h"
 #include "axmol/platform/Application.h"
 #include "axmol/base/Director.h"