From 29014d0ac84d733c5ae00d6b2f7b200df522511b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=93=E2=82=AC=E7=BB=BE=E8=B7=A8=E4=BC=92=7CDeal?= Date: Tue, 1 Nov 2022 06:48:57 +0800 Subject: [PATCH] Merge: f10e63c24d f1a2c04672 Merge pull request #942 from axmolengine/remove-search-resolutions-support Remove FileUtils::searchResolutionsOrderArray --- .../EffekseerForCocos2d-x/Metal/Effekseer+Metal.mm | 7 ++++--- extensions/Live2D/CMakeLists.txt | 2 +- tools/unix-ci/run-script.sh | 6 +++--- tools/win-ci/build.ps1 | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/extensions/Effekseer/EffekseerForCocos2d-x/Metal/Effekseer+Metal.mm b/extensions/Effekseer/EffekseerForCocos2d-x/Metal/Effekseer+Metal.mm index 728f756548..688b58289f 100644 --- a/extensions/Effekseer/EffekseerForCocos2d-x/Metal/Effekseer+Metal.mm +++ b/extensions/Effekseer/EffekseerForCocos2d-x/Metal/Effekseer+Metal.mm @@ -7,7 +7,7 @@ #include "../../EffekseerRendererCommon/ModelLoader.h" #include "renderer/backend/metal/TextureMTL.h" #include "renderer/backend/metal/CommandBufferMTL.h" -#include "renderer/backend/metal/Utils.h" +#include "renderer/backend/metal/UtilsMTL.h" #include namespace efk { @@ -21,8 +21,9 @@ void SetMTLObjectsFromCocos2d(Effekseer::RefPtr // use render pass descriptor from Cocos and add depth test auto descriptor = d->getRenderer()->getRenderPassDescriptor(); descriptor.depthTestEnabled = true; - // using Cocos render pass - bufferM->beginRenderPass(descriptor); + // using axmol render pass + auto target = d->getRenderer()->getRenderTarget(); + bufferM->beginRenderPass(target, descriptor); auto v = d->getRenderer()->getViewport(); // important for ensuring znear and zfar are in sync with Cocos bufferM->setViewport(v.x, v.y, v.w, v.h); diff --git a/extensions/Live2D/CMakeLists.txt b/extensions/Live2D/CMakeLists.txt index 283be2c6a8..e7adbe4f0a 100644 --- a/extensions/Live2D/CMakeLists.txt +++ b/extensions/Live2D/CMakeLists.txt @@ -39,7 +39,7 @@ add_subdirectory(Core) if (ANDROID) target_link_libraries(${LIB_NAME} INTERFACE Live2DCubismCore) else() - target_link_libraries(${LIB_NAME} Live2DCubismCore) + target_link_libraries(${LIB_NAME} PUBLIC Live2DCubismCore) endif() setup_ax_extension_config(${LIB_NAME}) diff --git a/tools/unix-ci/run-script.sh b/tools/unix-ci/run-script.sh index c17ac5553e..352de57309 100644 --- a/tools/unix-ci/run-script.sh +++ b/tools/unix-ci/run-script.sh @@ -42,7 +42,7 @@ function build_osx() cd $AX_ROOT mkdir -p build - cmake -S . -B build -GXcode -DCMAKE_OSX_ARCHITECTURES=$BUILD_ARCH -DAX_ENABLE_EXT_IMGUI=ON -DAX_USE_ALSOFT=ON + cmake -S . -B build -GXcode -DCMAKE_OSX_ARCHITECTURES=$BUILD_ARCH -DAX_ENABLE_EXT_IMGUI=ON -DAX_ENABLE_EXT_EFFEKSEER=ON -DAX_USE_ALSOFT=ON cmake --build build --config Release --target cpp_tests -- -quiet exit 0 @@ -54,7 +54,7 @@ function build_ios() cd $AX_ROOT - cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=cmake/ios.toolchain.cmake -DPLATFORM=SIMULATOR64 -DENABLE_ARC=OFF -DDEPLOYMENT_TARGET=9.0 -DAX_USE_ALSOFT=ON + cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=cmake/ios.toolchain.cmake -DPLATFORM=SIMULATOR64 -DENABLE_ARC=OFF -DDEPLOYMENT_TARGET=11.0 -DAX_ENABLE_EXT_EFFEKSEER=ON -DAX_USE_ALSOFT=ON cmake --build build --config Release --target cpp_tests -- -quiet -jobs $NUM_OF_CORES -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" exit 0 @@ -66,7 +66,7 @@ function build_tvos() cd $AX_ROOT - cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=cmake/ios.toolchain.cmake -DPLATFORM=SIMULATOR_TVOS -DENABLE_ARC=OFF -DDEPLOYMENT_TARGET=9.0 -DAX_USE_ALSOFT=ON + cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=cmake/ios.toolchain.cmake -DPLATFORM=SIMULATOR_TVOS -DENABLE_ARC=OFF -DDEPLOYMENT_TARGET=11.0 -DAX_ENABLE_EXT_EFFEKSEER=ON -DAX_USE_ALSOFT=ON cmake --build build --config Release --target cpp_tests -- -quiet -jobs $NUM_OF_CORES -destination "platform=tvOS Simulator,name=Apple TV Simulator" exit 0 diff --git a/tools/win-ci/build.ps1 b/tools/win-ci/build.ps1 index f9b28d54e3..53901d7c8a 100644 --- a/tools/win-ci/build.ps1 +++ b/tools/win-ci/build.ps1 @@ -7,7 +7,7 @@ if($BUILD_ARCH -eq "x86") { $CONFIG_ALL_OPTIONS += '-A', 'Win32' } -cmake -S . -B build_$BUILD_ARCH $CONFIG_ALL_OPTIONS -Thost=x64 -DAX_ENABLE_EXT_IMGUI=ON +cmake -S . -B build_$BUILD_ARCH $CONFIG_ALL_OPTIONS -Thost=x64 -DAX_ENABLE_EXT_IMGUI=TRUE -DAX_ENABLE_EXT_LIVE2D=TRUE -DAX_ENABLE_EXT_EFFEKSEER=TRUE cmake --build build_$BUILD_ARCH --config Release --target cpp_tests