Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge: f10e63c24d f1a2c04672 

Merge pull request #942 from axmolengine/remove-search-resolutions-support

Remove  FileUtils::searchResolutionsOrderArray
This commit is contained in:
涓€绾跨伒|Deal 2022-11-01 06:48:57 +08:00 committed by GitHub
parent 6ddd6f0e05
commit 29014d0ac8
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/Effekseer/EffekseerForCocos2d-x/Metal/Effekseer+Metal.mm
View File

@ -7,7 +7,7 @@
#include "../../EffekseerRendererCommon/ModelLoader.h" #include "../../EffekseerRendererCommon/ModelLoader.h"
#include "renderer/backend/metal/TextureMTL.h" #include "renderer/backend/metal/TextureMTL.h"
#include "renderer/backend/metal/CommandBufferMTL.h" #include "renderer/backend/metal/CommandBufferMTL.h"
#include "renderer/backend/metal/Utils.h" #include "renderer/backend/metal/UtilsMTL.h"
#include <Metal/LLGI.TextureMetal.h> #include <Metal/LLGI.TextureMetal.h>
namespace efk { namespace efk {
@ -21,8 +21,9 @@ void SetMTLObjectsFromCocos2d(Effekseer::RefPtr<EffekseerRenderer::CommandList>
// use render pass descriptor from Cocos and add depth test // use render pass descriptor from Cocos and add depth test
auto descriptor = d->getRenderer()->getRenderPassDescriptor(); auto descriptor = d->getRenderer()->getRenderPassDescriptor();
descriptor.depthTestEnabled = true; descriptor.depthTestEnabled = true;
// using Cocos render pass // using axmol render pass
bufferM->beginRenderPass(descriptor); auto target = d->getRenderer()->getRenderTarget();
bufferM->beginRenderPass(target, descriptor);
auto v = d->getRenderer()->getViewport(); auto v = d->getRenderer()->getViewport();
// important for ensuring znear and zfar are in sync with Cocos // important for ensuring znear and zfar are in sync with Cocos
bufferM->setViewport(v.x, v.y, v.w, v.h); bufferM->setViewport(v.x, v.y, v.w, v.h);

2
extensions/Live2D/CMakeLists.txt
View File

@ -39,7 +39,7 @@ add_subdirectory(Core)
if (ANDROID) if (ANDROID)
target_link_libraries(${LIB_NAME} INTERFACE Live2DCubismCore) target_link_libraries(${LIB_NAME} INTERFACE Live2DCubismCore)
else() else()
target_link_libraries(${LIB_NAME} Live2DCubismCore) target_link_libraries(${LIB_NAME} PUBLIC Live2DCubismCore)
endif() endif()
setup_ax_extension_config(${LIB_NAME}) setup_ax_extension_config(${LIB_NAME})

6
tools/unix-ci/run-script.sh
View File

@ -42,7 +42,7 @@ function build_osx()
cd $AX_ROOT cd $AX_ROOT
mkdir -p build 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 cmake --build build --config Release --target cpp_tests -- -quiet
exit 0 exit 0
@ -54,7 +54,7 @@ function build_ios()
cd $AX_ROOT 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)" cmake --build build --config Release --target cpp_tests -- -quiet -jobs $NUM_OF_CORES -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)"
exit 0 exit 0
@ -66,7 +66,7 @@ function build_tvos()
cd $AX_ROOT 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" cmake --build build --config Release --target cpp_tests -- -quiet -jobs $NUM_OF_CORES -destination "platform=tvOS Simulator,name=Apple TV Simulator"
exit 0 exit 0

2
tools/win-ci/build.ps1
View File

@ -7,7 +7,7 @@ if($BUILD_ARCH -eq "x86") {
$CONFIG_ALL_OPTIONS += '-A', 'Win32' $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 cmake --build build_$BUILD_ARCH --config Release --target cpp_tests