Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EnhancedGameObject and EffectGameObject macOS paddings #749

Merged
merged 14 commits into from
Oct 1, 2024
Merged

EnhancedGameObject and EffectGameObject macOS paddings #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e3e9381
Update MacOSArm.cpp
hiimjustin000 Aug 30, 2024
0f2a0f3
Update MacOSIntel.cpp
hiimjustin000 Aug 30, 2024
6403a92
Update Android64.cpp
hiimjustin000 Aug 30, 2024
83288aa
Merge branch 'geode-sdk:main' into patch-3
hiimjustin000 Sep 13, 2024
1468095
members!!!
hiimjustin000 Sep 13, 2024
0db982e
remove comment
hiimjustin000 Sep 13, 2024
741de84
fix padding
hiimjustin000 Sep 13, 2024
4630fb3
throw in some bools
hiimjustin000 Sep 13, 2024
033b7df
arm
hiimjustin000 Sep 13, 2024
0090c07
intel
hiimjustin000 Sep 13, 2024
6a6a159
wait that's the same thing
hiimjustin000 Sep 13, 2024
6ac94a4
geode member check
hiimjustin000 Sep 13, 2024
3760dba
removal
hiimjustin000 Sep 13, 2024
1688310
temp fix
hiimjustin000 Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions bindings/2.206/GeometryDash.bro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4411,7 +4411,7 @@ class EffectGameObject : EnhancedGameObject {
bool m_isDynamicMode;
// property 544
bool m_isSilent;
PAD = android 0x6, win 0x6;
PAD = android 0x6, win 0x6, mac 0x6;
// property 68
float m_rotationDegrees;
// property 69
Expand Down Expand Up @@ -4472,17 +4472,17 @@ class EffectGameObject : EnhancedGameObject {
bool m_isDualMode;
// property 76
int m_animationID;
PAD = android 0x8, win 0x8;
PAD = android 0x8, win 0x8, mac 0x8;
// property 87
bool m_isMultiTriggered;
PAD = android 0x2, win 0x2;
PAD = android 0x2, win 0x2, mac 0x2;
// property 93
bool m_triggerOnExit;
// property 95
int m_itemID2;
// property 534
int m_property534;
PAD = android 0x1, win 0x1;
PAD = android 0x1, win 0x1, mac 0x1;
// property 94
bool m_isDynamicBlock;
// property 80
Expand All @@ -4505,12 +4505,12 @@ class EffectGameObject : EnhancedGameObject {
int m_collectiblePoints;
// property 463
bool m_hasNoAnimation;
PAD = android32 0x1f, android64 0x23, win 0x23;
PAD = android32 0x1f, android64 0x23, win 0x23, mac 0x23;
// property 148
float m_gravityValue;
// property 284
bool m_isSinglePTouch;
PAD = android 0x3, win 0x3;
PAD = android 0x3, win 0x3, mac 0x3;
// property 371
float m_zoomValue;
// property 111
Expand All @@ -4535,15 +4535,15 @@ class EffectGameObject : EnhancedGameObject {
int m_channelValue;
// property 117
bool m_isReverse;
PAD = android 0xb, win 0xb;
PAD = android 0xb, win 0xb, mac 0xb;
// property 12
int m_secretCoinID;
PAD = android32 0x1c, android64 0x24, win 0x24;
PAD = android32 0x1c, android64 0x24, win 0x24, mac 0x24;
// property 280
bool m_ignoreGroupParent;
// property 281
bool m_ignoreLinkedObjects;
PAD = android 0x1, win 0x1;
PAD = android 0x1, win 0x1, mac 0x1;
}

[[link(android), depends(CAState), depends(PulseEffectAction), depends(CountTriggerAction), depends(OpacityEffectAction), depends(TouchToggleAction), depends(CollisionTriggerAction), depends(ToggleTriggerAction), depends(SpawnTriggerAction), depends(GroupCommandObject2), depends(TimerItem), depends(TimerTriggerAction)]]
Expand Down Expand Up @@ -4690,17 +4690,17 @@ class EnhancedGameObject : GameObject {
virtual void updateSyncedAnimation(float, int) = win 0x19ddf0, imac 0x2577a0, m1 0x2000b0;
virtual TodoReturn updateAnimateOnTrigger(bool) = m1 0x201478, imac 0x2596c0;

PAD = android32 0x25, win 0x2a, android64 0x22;
PAD = android32 0x25, win 0x2a, android64 0x22, mac 0x22;

bool m_hasCustomAnimation;
bool m_hasCustomRotation;
// property 98
bool m_disableRotation;
PAD = android32 0x3, win 0x3, android64 0x3;
PAD = android32 0x3, win 0x3, android64 0x3, mac 0x3;

// property 97
float m_rotationSpeed;
PAD = android32 0xc, win 0xc, android64 0xc;
PAD = android32 0xc, win 0xc, android64 0xc, mac 0xc;

// property 106
bool m_animationRandomizedStart;
Expand All @@ -4718,15 +4718,15 @@ class EnhancedGameObject : GameObject {
int m_singleFrame;
// property 592
bool m_animationOffset;
PAD = android32 0xf, win 0xf, android64 0xf;
PAD = android32 0xf, win 0xf, android64 0xf, mac 0xf;

// property 214
bool m_animateOnlyWhenActive;
// property 444
bool m_isNoMultiActivate; // used in platformer stuff
// property 99
bool m_isMultiActivate; // 0x592
PAD = android32 0x4, win 0x4, android64 0x8;
PAD = android32 0x4, win 0x4, android64 0x8, mac 0x8;
}

[[link(android)]]
Expand Down
2 changes: 1 addition & 1 deletion test/members/Android64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ GEODE_MEMBER_CHECK(FMODAudioEngine, m_system, 0x218);

GEODE_SIZE_CHECK(SimplePlayer, 0x2a8);
GEODE_SIZE_CHECK(EnhancedGameObject, 0x598);
// GEODE_SIZE_CHECK(EffectGameObject, 0x720);
GEODE_SIZE_CHECK(EffectGameObject, 0x720);

GEODE_MEMBER_CHECK(GameObject, m_hasExtendedCollision, 0x27c);
GEODE_MEMBER_CHECK(GameObject, m_activeMainColorID, 0x290);
Expand Down
2 changes: 2 additions & 0 deletions test/members/MacOSArm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ GEODE_MEMBER_CHECK(GJBaseGameLayer, m_sectionSizes, 0x3388);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_audioVisualizerBG, 0x3420);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_loadingLayer, 0x3498);

GEODE_SIZE_CHECK(EnhancedGameObject, 0x5a8);
GEODE_SIZE_CHECK(EffectGameObject, 0x730);

// GEODE_SIZE_CHECK(PlayerObject, 0xbe8);
GEODE_MEMBER_CHECK(PlayerObject, m_mainLayer, 0x550);
Expand Down
3 changes: 3 additions & 0 deletions test/members/MacOSIntel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ GEODE_MEMBER_CHECK(PlayLayer, m_isPaused, 0x36F7);
// GEODE_MEMBER_CHECK(GameObject, m_groups, 0x458);
// GEODE_MEMBER_CHECK(GameObject, m_effectManager, 0x4d8);

GEODE_SIZE_CHECK(EnhancedGameObject, 0x5a8);
GEODE_SIZE_CHECK(EffectGameObject, 0x730);

// // EffectGameObject
// GEODE_MEMBER_CHECK(EffectGameObject, m_duration, 0x4f0);
// GEODE_MEMBER_CHECK(EffectGameObject, m_followMod, 0x530);
Expand Down
Loading