7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-04-15 22:44:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Merge branch 'main' of github.com:geode-sdk/geode into 1.2.0-dev

Browse source
This commit is contained in:
matcool 2023-08-27 13:57:07 -03:00
commit 6e97c2700c
No known key found for this signature in database
GPG key ID: BF58756086D7AB1C
3 changed files with 7 additions and 6 deletions
.github/workflows
build.ymltest-offsets.yml
loader/src/cocos2d-ext
CCFileUtils.cpp

2
.github/workflows/build.yml vendored
View file

@ -44,7 +44,7 @@ jobs:
package_cmd: './installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg'
installer_path: './installer/mac/geode-installer-mac.pkg'
name: ${{ matrix.config.name }}
name: Build ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }}
steps:

2
.github/workflows/test-offsets.yml vendored
View file

@ -25,7 +25,7 @@ jobs:
prefixes: PATH="/usr/local/opt/ccache/libexec:$PATH"
extra_flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DGEODE_DEBUG=On
name: ${{ matrix.config.name }}
name: Test Offsets ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }}
steps:

9
loader/src/cocos2d-ext/CCFileUtils.cpp
View file

@ -98,12 +98,13 @@ struct FileUtilsUpdatePaths : Modify<FileUtilsUpdatePaths, CCFileUtils> {
using namespace std::string_literals;
using namespace std::string_view_literals;
// this filename in particular is never cached because its not actually present anywhere.
// this filename in particular (cc_2x2_white_image) is never cached because its not actually present anywhere.
// this is only an issue because cocos itself requests the full path for this in CCSprite,
// and with a lot of search paths (specially ones added by geode), this can cause a significant amount of lag.
// if (filename == "cc_2x2_white_image"sv) {
// return "cc_2x2_white_image"s;
// }
// GJ_GameSheetIcons.png comes from an improper plist distributed in GDS :P
if (filename == "cc_2x2_white_image"sv || filename == "GJ_GameSheetIcons.png"sv) {
return filename;
}
return CCFileUtils::fullPathForFilename(filename, unk);
}