Merge branch 'geode-sdk:main' into main

This commit is contained in:
Catto_ 2023-10-16 17:57:49 +02:00 committed by GitHub
commit f62249027e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1012,16 +1012,44 @@ class CustomSongLayer : FLAlertLayer, FLAlertLayerProtocol, TextInputDelegate, G
} }
class CustomSongWidget : cocos2d::CCNode, MusicDownloadDelegate, FLAlertLayerProtocol { class CustomSongWidget : cocos2d::CCNode, MusicDownloadDelegate, FLAlertLayerProtocol {
bool init(SongInfoObject*, LevelSettingsObject*, bool, bool, bool, bool, bool hideBackground) = mac 0x37be20, win 0x685b0; bool init(SongInfoObject*, LevelSettingsObject*, bool, bool, bool, bool, bool) = mac 0x37be20, win 0x685b0;
void FLAlert_Clicked(FLAlertLayer*, bool) {} void FLAlert_Clicked(FLAlertLayer*, bool) {}
void loadSongInfoFinished(SongInfoObject*) {} void loadSongInfoFinished(SongInfoObject*) {}
void startDownload() = win 0x69610;
void startMonitorDownload() = win 0x696b0;
void updatePlaybackBtn() = win 0x69970;
void updateSongInfo() = win 0x69bf0;
void updateSongObject(SongInfoObject* song) = win 0x69280, mac 0x37d690; void updateSongObject(SongInfoObject* song) = win 0x69280, mac 0x37d690;
void onCancelDownload(CCObject*) = win 0x693b0;
void onDownload(CCObject*) = win 0x69540;
void onGetSongInfo(CCObject*) = win 0x69490;
void onMore(CCObject*) = win 0x68e20;
void onPlayback(CCObject*) = win 0x697b0;
void onSelect(CCObject*) = win 0x69760;
SongInfoObject* m_songInfo; SongInfoObject* m_songInfo;
PAD = win 0x1C; cocos2d::CCMenu* m_buttonMenu;
cocos2d::CCLabelBMFont* m_songLabel;
cocos2d::CCLabelBMFont* m_artistLabel;
cocos2d::CCLabelBMFont* m_songIDLabel;
cocos2d::CCLabelBMFont* m_errorLabel;
CCMenuItemSpriteExtra* m_downloadBtn; CCMenuItemSpriteExtra* m_downloadBtn;
PAD = win 0x30; CCMenuItemSpriteExtra* m_cancelDownloadBtn;
CCMenuItemSpriteExtra* m_selectSongBtn;
CCMenuItemSpriteExtra* m_getSongInfoBtn;
CCMenuItemSpriteExtra* m_playMusicBtn;
CCMenuItemSpriteExtra* m_moreBtn;
cocos2d::CCSprite* m_sliderGroove;
cocos2d::CCSprite* m_sliderBar;
LevelSettingsObject* m_levelSettings;
bool m_showSelectSongBtn;
bool m_showPlayMusicBtn;
bool m_showDownloadButtons;
bool m_isNotDownloading;
bool m_hasDefaultSong;
int m_customSongID;
bool m_unkBool;
} }
class CustomizeObjectLayer : FLAlertLayer, TextInputDelegate, HSVWidgetPopupDelegate, ColorSelectDelegate, ColorSetupDelegate { class CustomizeObjectLayer : FLAlertLayer, TextInputDelegate, HSVWidgetPopupDelegate, ColorSelectDelegate, ColorSetupDelegate {
@ -1718,7 +1746,7 @@ class FLAlertLayer : cocos2d::CCLayerColor {
cocos2d::ccColor3B m_color2; cocos2d::ccColor3B m_color2;
ButtonSprite* m_button1; ButtonSprite* m_button1;
ButtonSprite* m_button2; ButtonSprite* m_button2;
cocos2d::CCLayerColor* m_scrollingLayer; ScrollingLayer* m_scrollingLayer;
int m_joystickConnected; int m_joystickConnected;
bool m_containsBorder; bool m_containsBorder;
bool m_noAction; bool m_noAction;
@ -1730,11 +1758,13 @@ class FLAlertLayerProtocol {
class FMODAudioEngine : cocos2d::CCNode { class FMODAudioEngine : cocos2d::CCNode {
static FMODAudioEngine* sharedEngine() = mac 0x20ef80, win 0x239f0; static FMODAudioEngine* sharedEngine() = mac 0x20ef80, win 0x239f0;
void setupAudioEngine() = win 0x23a70;
void preloadEffect(gd::string filename) = win 0x24240; void preloadEffect(gd::string filename) = win 0x24240;
bool isBackgroundMusicPlaying() = win 0x24050; bool isBackgroundMusicPlaying() = win 0x24050;
bool isBackgroundMusicPlaying(gd::string path) = win 0x24080; bool isBackgroundMusicPlaying(gd::string path) = win 0x24080;
void playBackgroundMusic(gd::string path, bool fade, bool paused) = win 0x23d80; void playBackgroundMusic(gd::string path, bool fade, bool paused) = win 0x23d80;
void setBackgroundMusicTime(float time) = win 0x23fb0;
virtual void update(float) = win 0x23b20; virtual void update(float) = win 0x23b20;
cocos2d::CCDictionary* m_dictionary; cocos2d::CCDictionary* m_dictionary;
@ -2682,7 +2712,7 @@ class GJSpiderSprite : GJRobotSprite {
class GJSpriteColor : cocos2d::CCNode { class GJSpriteColor : cocos2d::CCNode {
int m_colorID; int m_colorID;
int m_defaultColorID; int m_defaultColorID;
float m_unk_0F4; float m_opacity;
cocos2d::ccHSVValue m_hsv; cocos2d::ccHSVValue m_hsv;
bool m_usesHSV; bool m_usesHSV;
float unk_10C; float unk_10C;
@ -3282,15 +3312,16 @@ class GameObject : CCSpritePlus {
void addToTempOffset(float, float) = mac 0x335700; void addToTempOffset(float, float) = mac 0x335700;
void calculateOrientedBox() = mac 0x342b20, win 0xef1a0; void calculateOrientedBox() = mac 0x342b20, win 0xef1a0;
void canChangeCustomColor() = mac 0x342db0; void canChangeCustomColor() = mac 0x342db0;
cocos2d::_ccColor3B& colorForMode(int, bool) = mac 0x343460, win 0xef8d0;
float groupOpacityMod() = win 0xebda0; float groupOpacityMod() = win 0xebda0;
cocos2d::_ccColor3B& colorForMode(int colorMode, bool isMain) = mac 0x343460, win 0xef8d0;
cocos2d::_ccColor3B& groupColor(cocos2d::_ccColor3B const&, bool) = win 0xef9e0;
cocos2d::_ccColor3B& getActiveColorForMode(int, bool) = mac 0x343860, win 0xefb10;
void commonSetup() = mac 0x2f5570, win 0xcfac0; void commonSetup() = mac 0x2f5570, win 0xcfac0;
void copyGroups(GameObject*) = mac 0x33ae30, win 0xeb9d0; void copyGroups(GameObject*) = mac 0x33ae30, win 0xeb9d0;
static GameObject* createWithFrame(const char*) = mac 0x2f5490, win 0xcf8f0; static GameObject* createWithFrame(const char*) = mac 0x2f5490, win 0xcf8f0;
static GameObject* createWithKey(int) = mac 0x2f4ce0, win 0xcf4f0; static GameObject* createWithKey(int) = mac 0x2f4ce0, win 0xcf4f0;
void destroyObject() = mac 0x336a00; void destroyObject() = mac 0x336a00;
void determineSlopeDirection() = mac 0x33a9e0, win 0xeb670; void determineSlopeDirection() = mac 0x33a9e0, win 0xeb670;
cocos2d::_ccColor3B& getActiveColorForMode(int, bool) = mac 0x343860, win 0xefb10;
void getBallFrame(int) = mac 0x341bf0; void getBallFrame(int) = mac 0x341bf0;
cocos2d::CCPoint getBoxOffset() = mac 0x3353d0, win 0xef350; cocos2d::CCPoint getBoxOffset() = mac 0x3353d0, win 0xef350;
const cocos2d::_ccColor3B& getColorIndex() = mac 0x343b90; const cocos2d::_ccColor3B& getColorIndex() = mac 0x343b90;
@ -3321,7 +3352,15 @@ class GameObject : CCSpritePlus {
void loadGroupsFromString(gd::string str) = mac 0x33b380, win 0xebcb0; void loadGroupsFromString(gd::string str) = mac 0x33b380, win 0xebcb0;
static GameObject* objectFromString(gd::string, bool) = mac 0x33b720, win 0xebe50; static GameObject* objectFromString(gd::string, bool) = mac 0x33b720, win 0xebe50;
void playShineEffect() = mac 0x2fa9d0, win 0xeab20; void playShineEffect() = mac 0x2fa9d0, win 0xeab20;
void quickUpdatePosition() = mac 0x335790; //void quickUpdatePosition() = mac 0x335790;
// inlined on windows
void quickUpdatePosition() {
cocos2d::CCPoint newPos = getRealPosition();
this->setPosition(newPos);
if (m_detailSprite && !m_hasDetailColor) {
m_detailSprite->setPosition(newPos);
}
}
void removeGlow() = mac 0x2f7f70; void removeGlow() = mac 0x2f7f70;
void resetGroupDisabled() = mac 0x2fa7e0; void resetGroupDisabled() = mac 0x2fa7e0;
void saveActiveColors() = mac 0x33d250, win 0xee3e0; void saveActiveColors() = mac 0x33d250, win 0xee3e0;
@ -3350,8 +3389,7 @@ class GameObject : CCSpritePlus {
bool canAllowMultiActivate() = mac 0x343ca0, win 0xf06b0; bool canAllowMultiActivate() = mac 0x343ca0, win 0xf06b0;
void createGroupContainer(int size) = mac 0x33aca0, win 0xeb870; void createGroupContainer(int size) = mac 0x33aca0, win 0xeb870;
bool m_unk3; cocos2d::_ccColor3B m_color;
bool m_isBlueMaybe;
float m_unk2; float m_unk2;
float m_unk; float m_unk;
float m_unk3f; float m_unk3f;
@ -3454,7 +3492,7 @@ class GameObject : CCSpritePlus {
int m_objectID; int m_objectID;
bool m_unk364; bool m_unk364;
bool m_unk365; bool m_unk365;
bool m_unk366; bool m_ignoreEnter;
bool m_ignoreFade; bool m_ignoreFade;
bool m_unk368; bool m_unk368;
bool m_unk369; bool m_unk369;
@ -3508,8 +3546,8 @@ class GameObject : CCSpritePlus {
int m_unk414; int m_unk414;
PAD = mac 0xc, win 0xc; PAD = mac 0xc, win 0xc;
cocos2d::CCPoint m_firstPosition; cocos2d::CCPoint m_firstPosition;
bool m_unk42C; bool m_queuedForPositionUpdate;
bool m_unk42D; bool m_shouldUpdateFirstPosition;
PAD = mac 0x6, win 0x6; PAD = mac 0x6, win 0x6;
bool m_isAnimated; bool m_isAnimated;
PAD = mac 0x7, win 0x7; PAD = mac 0x7, win 0x7;
@ -3526,7 +3564,7 @@ class GameObject : CCSpritePlus {
GJEffectManager* m_effectManager; GJEffectManager* m_effectManager;
bool m_unk458; bool m_unk458;
bool m_unk459; bool m_unk459;
bool m_unk45A; bool m_inOptimizedGroup;
bool m_wasForcedRotatedPositionUpdateIdk; bool m_wasForcedRotatedPositionUpdateIdk;
PAD = mac 0x8, win 0x8; PAD = mac 0x8, win 0x8;
bool m_orbMultiActivate; bool m_orbMultiActivate;
@ -4683,7 +4721,8 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, CurrencyRewardDelegate,
void switchToRollMode(PlayerObject*, GameObject*, bool) = mac 0x7bbe0; void switchToRollMode(PlayerObject*, GameObject*, bool) = mac 0x7bbe0;
void switchToSpiderMode(PlayerObject*, GameObject*, bool) = mac 0x7bd20; void switchToSpiderMode(PlayerObject*, GameObject*, bool) = mac 0x7bd20;
callback float timeForXPos(float) = mac 0x7d120, win 0x2087d0; callback float timeForXPos(float) = mac 0x7d120, win 0x2087d0;
float timeForXPos2(float, bool) = mac 0x293eb0, win 0x1fd3d0; float timeForXPos2(float, bool) = mac 0x293eb0, win 0x208800;
callback float xPosForTime(float) = mac 0x7d140, win 0x208840;
void toggleBGEffectVisibility(bool) = mac 0x7fe80; void toggleBGEffectVisibility(bool) = mac 0x7fe80;
void toggleDualMode(GameObject*, bool, PlayerObject*, bool) = mac 0x7bf90, win 0x208880; void toggleDualMode(GameObject*, bool, PlayerObject*, bool) = mac 0x7bf90, win 0x208880;
void toggleFlipped(bool, bool) = mac 0x7bdc0, win 0x20ab20; void toggleFlipped(bool, bool) = mac 0x7bdc0, win 0x20ab20;
@ -4712,7 +4751,6 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, CurrencyRewardDelegate,
virtual void visit() = mac 0x75ef0, win 0x200020; virtual void visit() = mac 0x75ef0, win 0x200020;
void visitWithColorFlash() = mac 0x761f0, win 0x200190; void visitWithColorFlash() = mac 0x761f0, win 0x200190;
void willSwitchToMode(int, PlayerObject*) = mac 0x7b9e0; void willSwitchToMode(int, PlayerObject*) = mac 0x7b9e0;
void xPosForTime(float) = mac 0x7d140, win 0x208840;
~PlayLayer() = mac 0x6b090, win 0x1fafc0; ~PlayLayer() = mac 0x6b090, win 0x1fafc0;
float unused4c8; float unused4c8;
@ -4743,7 +4781,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, CurrencyRewardDelegate,
EndPortalObject* m_endPortal; EndPortalObject* m_endPortal;
cocos2d::CCArray* m_checkpoints; cocos2d::CCArray* m_checkpoints;
cocos2d::CCArray* m_speedObjects; cocos2d::CCArray* m_speedObjects;
cocos2d::CCArray* unk340; cocos2d::CCArray* m_allSpeedObjects;
cocos2d::CCArray* unk344; cocos2d::CCArray* unk344;
cocos2d::CCSprite* unk348; cocos2d::CCSprite* unk348;
float m_backgroundRepeat; float m_backgroundRepeat;
@ -4917,7 +4955,7 @@ class PlayerObject : GameObject, AnimatedSpriteDelegate {
void boostPlayer(float) = mac 0x21d6b0, win 0x1f8f30; void boostPlayer(float) = mac 0x21d6b0, win 0x1f8f30;
void bumpPlayer(float, int) = mac 0x22d890; void bumpPlayer(float, int) = mac 0x22d890;
void buttonDown(PlayerButton) = mac 0x22b7e0; void buttonDown(PlayerButton) = mac 0x22b7e0;
void checkSnapJumpToObject(GameObject*) = mac 0x2217f0; void checkSnapJumpToObject(GameObject*) = mac 0x2217f0, win 0x1ece70;
bool collidedWithObject(float fl, GameObject* obj) { bool collidedWithObject(float fl, GameObject* obj) {
auto rect = obj->getObjectRect(); auto rect = obj->getObjectRect();
return collidedWithObject(fl, obj, rect); return collidedWithObject(fl, obj, rect);
@ -5253,6 +5291,11 @@ class RingObject : EffectGameObject {
class ScrollingLayer : cocos2d::CCLayerColor { class ScrollingLayer : cocos2d::CCLayerColor {
static ScrollingLayer* create(cocos2d::CCSize, cocos2d::CCPoint, float) = mac 0x41a900, win 0x2d8e0; static ScrollingLayer* create(cocos2d::CCSize, cocos2d::CCPoint, float) = mac 0x41a900, win 0x2d8e0;
PAD = win 0x28;
float m_layerHeight;
PAD = win 0x4;
cocos2d::CCLayer* m_scrollLayer;
cocos2d::CCNode* m_parent;
} }
class SelectArtLayer { class SelectArtLayer {
@ -5594,12 +5637,11 @@ class SpawnTriggerAction : cocos2d::CCNode {
} }
class SpeedObject : cocos2d::CCNode { class SpeedObject : cocos2d::CCNode {
float m_unknown; Speed m_speed;
float m_somethingToCompare; float m_xPos;
float m_idk3; GameObject* m_object;
float m_idk4;
static SpeedObject* create(GameObject*, int, float) = win 0x20DE70; static SpeedObject* create(GameObject* object, Speed speed, float x) = win 0x20de70;
} }
class SpritePartDelegate {} class SpritePartDelegate {}