Skip to content

Commit 78e1297

Browse files
authored
Merge branch 'geode-sdk:main' into main
2 parents 708ad08 + 226991e commit 78e1297

File tree

25 files changed

+555
-284
lines changed

25 files changed

+555
-284
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
- name: Get changed files in the codegen folder
2222
id: changed
23-
uses: tj-actions/changed-files@v42
23+
uses: tj-actions/changed-files@v45
2424
with:
2525
files: |
2626
.github/workflows/build.yml
@@ -85,6 +85,16 @@ jobs:
8585
echo "$GITHUB_WORKSPACE/llvm/bin" >> $GITHUB_PATH
8686
if: matrix.config.id == 'win'
8787

88+
- name: Update Clang (Linux)
89+
shell: bash
90+
run: |
91+
sudo apt update
92+
sudo apt remove clang-14
93+
sudo apt install gcc-12 g++-12
94+
sudo ln -sf /usr/bin/gcc-12 /usr/bin/clang
95+
sudo ln -sf /usr/bin/g++-12 /usr/bin/clang++
96+
if: matrix.config.id == 'linux'
97+
8898
- name: Configure
8999
run: >
90100
cmake codegen -B codegen/build

.github/workflows/verify.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout repo
10-
uses: actions/checkout@v3
10+
uses: actions/checkout@v4
1111

1212
- name: Restore cache
1313
id: codegen-cache
14-
uses: actions/cache@v3
14+
uses: actions/cache@v4
1515
with:
1616
path: bin
1717
key: codegen-${{ hashFiles('codegen/**') }}
@@ -24,7 +24,7 @@ jobs:
2424
cmake --install build
2525
2626
- name: Upload Codegen binary
27-
uses: actions/upload-artifact@v3
27+
uses: actions/upload-artifact@v4
2828
with:
2929
name: Codegen
3030
path: bin/Codegen
@@ -34,15 +34,15 @@ jobs:
3434
needs: build
3535
steps:
3636
- name: Checkout repo
37-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3838

3939
- name: Download Codegen binary
40-
uses: actions/download-artifact@v3
40+
uses: actions/download-artifact@v4
4141
with:
4242
name: Codegen
4343

4444
- name: Verify
45-
run: 'chmod +x ./Codegen && ./Codegen Win32 bindings/2.200 out'
45+
run: 'chmod +x ./Codegen && ./Codegen Win64 bindings/2.2074 out'
4646

4747
test-members:
4848
# dont bother running member test if broma isnt even valid
@@ -128,7 +128,7 @@ jobs:
128128

129129
- name: Set up codegen binary cache
130130
id: codegen-cache
131-
uses: actions/cache@v3
131+
uses: actions/cache@v4
132132
with:
133133
path: build/bindings/codegen
134134
# cache by os since for android32 and 64 the codegen binary is the same

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ scripts/Bindings.json
66
__optcall.xml
77
__membercall.xml
88
/.vs
9+
**/.cache

bindings/2.207/GeometryDash.bro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8501,7 +8501,7 @@ class GJBaseGameLayer : cocos2d::CCLayer, TriggerEffectDelegate {
85018501
cocos2d::CCParticleSystemQuad* m_unk3238;
85028502
bool m_unk3240;
85038503
bool m_unk3241;
8504-
bool m_unk3242;
8504+
bool m_playerDied;
85058505
double m_extraDelta;
85068506
bool m_started;
85078507
bool m_unk3251;

bindings/2.2072/GeometryDash.bro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8501,7 +8501,7 @@ class GJBaseGameLayer : cocos2d::CCLayer, TriggerEffectDelegate {
85018501
cocos2d::CCParticleSystemQuad* m_unk3238;
85028502
bool m_unk3240;
85038503
bool m_unk3241;
8504-
bool m_unk3242;
8504+
bool m_playerDied;
85058505
double m_extraDelta;
85068506
bool m_started;
85078507
bool m_unk3251;

bindings/2.2073/GeometryDash.bro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8535,7 +8535,7 @@ class GJBaseGameLayer : cocos2d::CCLayer, TriggerEffectDelegate {
85358535
cocos2d::CCParticleSystemQuad* m_unk3238;
85368536
bool m_unk3240;
85378537
bool m_unk3241;
8538-
bool m_unk3242;
8538+
bool m_playerDied;
85398539
double m_extraDelta;
85408540
bool m_started;
85418541
bool m_unk3251;

bindings/2.2074/Cocos2d.bro

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ class cocos2d::CCNode : cocos2d::CCObject {
10021002
void stopAction(cocos2d::CCAction*) = m1 0x20dd6c, imac 0x261fb0;
10031003
void stopActionByTag(int) = m1 0x20dd74, imac 0x261fd0;
10041004
void stopAllActions() = imac 0x260e30, m1 0x20cbec;
1005-
void transform();
1005+
void transform() = m1 0x20d820, imac 0x261a70;
10061006
void transformAncestors();
10071007
void unschedule(cocos2d::SEL_SCHEDULE) = imac 0x262270, m1 0x20df6c;
10081008
void unscheduleAllSelectors() = imac 0x260e50, m1 0x20cbf8;
@@ -1762,9 +1762,9 @@ class cocos2d::CCDirector : cocos2d::CCObject, cocos2d::TypeInfo {
17621762
void pause();
17631763
void popScene() = imac 0x471430, m1 0x3e025c;
17641764
bool popSceneWithTransition(float, cocos2d::PopTransition) = imac 0x4714c0, m1 0x3e02e8;
1765-
void popToRootScene();
1766-
void popToSceneInStack(cocos2d::CCScene*);
1767-
void popToSceneStackLevel(int);
1765+
void popToRootScene() = imac 0x4715a0, m1 0x3e03b8;
1766+
void popToSceneInStack(cocos2d::CCScene*) = imac 0x471720, m1 0x3e0514;
1767+
void popToSceneStackLevel(int) = imac 0x4715b0, m1 0x3e03c0;
17681768
void purgeCachedData();
17691769
void purgeDirector() = imac 0x471780;
17701770
bool pushScene(cocos2d::CCScene*) = imac 0x471230, m1 0x3e0034;
@@ -1803,11 +1803,10 @@ class cocos2d::CCDirector : cocos2d::CCObject, cocos2d::TypeInfo {
18031803

18041804
[[link(win, android)]]
18051805
class cocos2d::CCNodeRGBA : cocos2d::CCNode, cocos2d::CCRGBAProtocol {
1806-
static cocos2d::CCNodeRGBA* create() = ios inline {
1806+
static cocos2d::CCNodeRGBA* create() = m1 0x20ed04, imac 0x2630c0, ios inline {
18071807
auto pRet = new cocos2d::CCNodeRGBA();
18081808

1809-
if (pRet->init())
1810-
{
1809+
if (pRet->init()) {
18111810
pRet->autorelease();
18121811
return pRet;
18131812
}
@@ -3388,6 +3387,11 @@ class cocos2d {
33883387
static float clampf(float, float, float);
33893388
}
33903389

3390+
[[link(win, android)]]
3391+
void kmGLPushMatrix() = m1 0x1aba8c, imac 0x1f5fa0;
3392+
[[link(win, android)]]
3393+
void kmGLPopMatrix() = m1 0x1abad0, imac 0x1f5fe0;
3394+
33913395
[[link(win, android)]]
33923396
class DS_Dictionary {
33933397
DS_Dictionary() = m1 0x135e9c, imac 0x169200;
@@ -3736,3 +3740,16 @@ class cocos2d::CCConfiguration {
37363740
bool supportsPVRTC() const;
37373741
bool supportsShareableVAO() const;
37383742
}
3743+
3744+
[[link(win, android)]]
3745+
class cocos2d::CCPoolManager {
3746+
// CCPoolManager();
3747+
void addObject(cocos2d::CCObject*);
3748+
void finalize();
3749+
cocos2d::CCAutoreleasePool* getCurReleasePool();
3750+
void pop() = m1 0x367288, imac 0x3e4f70;
3751+
static void purgePoolManager();
3752+
void push();
3753+
void removeObject(cocos2d::CCObject*);
3754+
static cocos2d::CCPoolManager* sharedPoolManager();
3755+
}

0 commit comments

Comments
 (0)