Skip to content

Commit

Permalink
Merge branch 'geode-sdk:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@user95401
user95401 authored Sep 8, 2024
2 parents b844295 + bd13cd0 commit 2d16eb5
Show file tree
Hide file tree
Showing 18 changed files with 6,426 additions and 5,167 deletions.
133 changes: 87 additions & 46 deletions bindings/1.920/GeometryDash.bro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1114,71 +1114,96 @@ class CCTextInputNode : cocos2d::CCLayer, cocos2d::CCIMEDelegate, cocos2d::CCTex
}

[[link(android)]]
class CheckpointObject {
class CheckpointObject : cocos2d::CCNode {
// virtual ~CheckpointObject();
// CheckpointObject();

static CheckpointObject* create();

TodoReturn getActiveEnterEffect();
TodoReturn getBgColorAction();
TodoReturn getCameraPos();
TodoReturn getColorAction(ColorAction*, cocos2d::ccColor3B);
TodoReturn getCustomColor01Action();
TodoReturn getCustomColor02Action();
TodoReturn getCustomColor03Action();
TodoReturn getCustomColor04Action();
TodoReturn getDLineColorAction();
TodoReturn getDualMode();
TodoReturn getGColorAction();
TodoReturn getIsFlipped();
TodoReturn getLineColorAction();
TodoReturn getObjColorAction();
TodoReturn getObject();
TodoReturn getPlayerCheck01();
TodoReturn getPlayerCheck02();
TodoReturn getPortalObject();
TodoReturn getTimeStamp();
ColorAction* getColorAction(ColorAction*, cocos2d::ccColor3B);
GameObject* getObject();
void setObject(GameObject*);

virtual bool init();
virtual PlayerCheckpoint* getPlayerCheck01() const;
virtual void setPlayerCheck01(PlayerCheckpoint*);
virtual PlayerCheckpoint* getPlayerCheck02() const;
virtual void setPlayerCheck02(PlayerCheckpoint*);
virtual bool getDualMode() const;
virtual void setDualMode(bool);
virtual bool getIsFlipped() const;
virtual void setIsFlipped(bool);
virtual cocos2d::CCPoint getCameraPos() const;
virtual void setCameraPos(cocos2d::CCPoint);
virtual ColorAction* getBgColorAction() const;
virtual void setBgColorAction(ColorAction*);
virtual ColorAction* getLineColorAction() const;
virtual void setLineColorAction(ColorAction*);
virtual ColorAction* getObjColorAction() const;
virtual void setObjColorAction(ColorAction*);
virtual ColorAction* getGColorAction() const;
virtual void setGColorAction(ColorAction*);
virtual ColorAction* getDLineColorAction() const;
virtual void setDLineColorAction(ColorAction*);
virtual ColorAction* getCustomColor01Action() const;
virtual void setCustomColor01Action(ColorAction*);
virtual ColorAction* getCustomColor02Action() const;
virtual void setCustomColor02Action(ColorAction*);
virtual ColorAction* getCustomColor03Action() const;
virtual void setCustomColor03Action(ColorAction*);
virtual ColorAction* getCustomColor04Action() const;
virtual void setCustomColor04Action(ColorAction*);
virtual EnterEffect getActiveEnterEffect() const;
virtual void setActiveEnterEffect(EnterEffect);
virtual GameObject* getPortalObject() const;
virtual void setPortalObject(GameObject*);
virtual double getTimeStamp() const;
virtual void setTimeStamp(double);

GameObject* m_object;
PlayerCheckpoint* m_playerCheck01;
PlayerCheckpoint* m_playerCheck02;
bool m_dualMode;
bool m_isFlipped;
cocos2d::CCPoint m_cameraPos;
ColorAction* m_bgColorAction;
ColorAction* m_lineColorAction;
ColorAction* m_objColorAction;
ColorAction* m_gColorAction;
ColorAction* m_dLineColorAction;
ColorAction* m_customColor01Action;
ColorAction* m_customColor02Action;
ColorAction* m_customColor03Action;
ColorAction* m_customColor04Action;
EnterEffect m_activeEnterEffect;
GameObject* m_portalObject;
double m_timeStamp;
}

[[link(android)]]
class ColorAction {
class ColorAction : cocos2d::CCNode {
// virtual ~ColorAction();

static ColorAction* create(cocos2d::ccColor3B, cocos2d::ccColor3B, float, double, bool);

TodoReturn getBlend();
TodoReturn getDuration();
TodoReturn getFromColor();
TodoReturn getTimeStamp();
TodoReturn getToColor();
bool init(cocos2d::ccColor3B, cocos2d::ccColor3B, float, double, bool);

virtual cocos2d::ccColor3B getFromColor() const;
virtual void setFromColor(cocos2d::ccColor3B);
virtual cocos2d::ccColor3B getToColor() const;
virtual void setToColor(cocos2d::ccColor3B);
virtual float getDuration() const;
virtual void setDuration(float);
virtual double getTimeStamp() const;
virtual void setTimeStamp(double);
virtual bool getBlend() const;
virtual void setBlend(bool);

cocos2d::ccColor3B m_fromColor;
cocos2d::ccColor3B m_toColor;
float m_duration;
double m_timeStamp;
bool m_blend;
}

[[link(android)]]
Expand Down Expand Up @@ -5147,13 +5172,16 @@ class MyLevelsLayer {
}

[[link(android)]]
class NodePoint {
class NodePoint : cocos2d::CCObject {
// virtual ~NodePoint();

static NodePoint* create(cocos2d::CCPoint);

TodoReturn getPoint();
bool init(cocos2d::CCPoint);

virtual cocos2d::CCPoint getPoint() const;

cocos2d::CCPoint m_point;
}

[[link(android)]]
Expand Down Expand Up @@ -5244,21 +5272,24 @@ class ObjectManager {
}

[[link(android)]]
class ObjectToolbox {
class ObjectToolbox : cocos2d::CCNode {
// virtual ~ObjectToolbox();

static ObjectToolbox* sharedState();
static cocos2d::CCDictionary* stringSetupToDict(gd::string, char const*);
static gd::map<gd::string, gd::string> stringSetupToMap(gd::string, char const*);

TodoReturn allKeys();
TodoReturn frameToKey(char const*);
TodoReturn gridNodeSizeForKey(int);
TodoReturn intKeyToFrame(int);
TodoReturn keyToFrame(char const*);
TodoReturn perspectiveBlockFrame(int);
TodoReturn stringSetupToDict(gd::string, char const*);
TodoReturn stringSetupToMap(gd::string, char const*);
cocos2d::CCArray* allKeys();
const char* frameToKey(char const*);
float gridNodeSizeForKey(int);
const char* intKeyToFrame(int);
const char* keyToFrame(char const*);
const char* perspectiveBlockFrame(int);

virtual bool init();

cocos2d::CCDictionary* m_frameToKeyDict;
cocos2d::CCDictionary* m_keyToFrameDict;
}

[[link(android)]]
Expand Down Expand Up @@ -5464,13 +5495,13 @@ class PlayerObject : GameObject {
TodoReturn levelFlipFinished();
TodoReturn levelFlipping();
TodoReturn levelWillFlip();
TodoReturn loadFromCheckpoint(PlayerCheckpoint*);
void loadFromCheckpoint(PlayerCheckpoint*);
TodoReturn lockPlayer();
TodoReturn logValues();
TodoReturn placeStreakPoint();
TodoReturn playBurstEffect();
TodoReturn playerDestroyed(bool) = win 0xddda0;
TodoReturn playerIsFalling();
bool playerIsFalling();
TodoReturn postCollision();
TodoReturn preCollision();
TodoReturn preSlopeCollision(float, GameObject*);
Expand All @@ -5489,7 +5520,7 @@ class PlayerObject : GameObject {
TodoReturn runBallRotation2();
TodoReturn runNormalRotation();
TodoReturn runRotateAction(bool);
TodoReturn saveToCheckpoint(PlayerCheckpoint*);
void saveToCheckpoint(PlayerCheckpoint*);
void setSecondColor(cocos2d::ccColor3B const&);
TodoReturn setupStreak() = win 0xd98f0;
TodoReturn spawnCircle();
Expand Down Expand Up @@ -5740,7 +5771,7 @@ class PlayLayer : cocos2d::CCLayer, CCCircleWaveDelegate, GameplayDelegate {
TodoReturn claimParticle(gd::string);
TodoReturn clearPickedUpItems();
TodoReturn colorObject(int, cocos2d::ccColor3B);
TodoReturn createCheckpoint();
CheckpointObject* createCheckpoint();
TodoReturn createObjectsFromSetup(gd::string);
TodoReturn createParticle(int, char const*, int, cocos2d::tCCPositionType);
TodoReturn delayedResetLevel();
Expand Down Expand Up @@ -5782,7 +5813,7 @@ class PlayLayer : cocos2d::CCLayer, CCCircleWaveDelegate, GameplayDelegate {
bool isFlipping();
void levelComplete();
TodoReturn lightningFlash(cocos2d::CCPoint, cocos2d::ccColor3B);
TodoReturn loadLastCheckpoint();
void loadLastCheckpoint();
TodoReturn markCheckpoint();
TodoReturn moveCameraToPos(cocos2d::CCPoint);
TodoReturn objectIntersectsCircle(GameObject*, GameObject*);
Expand Down Expand Up @@ -7125,7 +7156,7 @@ class UploadPopup : FLAlertLayer, LevelUploadDelegate {
}

[[link(android)]]
class VideoOptionsLayer {
class VideoOptionsLayer : FLAlertLayer {
// virtual ~VideoOptionsLayer();

static VideoOptionsLayer* create();
Expand All @@ -7140,10 +7171,20 @@ class VideoOptionsLayer {
void onResolutionPrev(cocos2d::CCObject* sender);
void onTextureQualityNext(cocos2d::CCObject* sender);
void onTextureQualityPrev(cocos2d::CCObject* sender);
TodoReturn toggleResolution();
TodoReturn updateResolution(int);
TodoReturn updateTextureQuality(int);
void toggleResolution();
void updateResolution(int);
void updateTextureQuality(int);

virtual bool init();
virtual void keyBackClicked();

CCMenuItemSpriteExtra* m_prevResolution;
CCMenuItemSpriteExtra* m_nextResolution;
cocos2d::CCLabelBMFont* m_resolutionLabel;
cocos2d::CCLabelBMFont* m_resolutionText;
cocos2d::CCLabelBMFont* m_qualityLabel;
cocos2d::TextureQuality m_quality;
cocos2d::CCArray* m_resolutions;
bool m_isFullscreen;
int m_currentResolution;
}
12 changes: 6 additions & 6 deletions bindings/2.113/GeometryDash.bro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3241,7 +3241,7 @@ class GameManager : GManager {
void accountStatusChanged() = mac 0x1cdad0;
cocos2d::_ccColor3B colorForIdx(int) = mac 0x1cbc80, win 0xc8d10, ios 0x237488;
void didExitPlayscene() = mac 0x1d0230;
void doQuickSave() = mac 0x1d0200;
void doQuickSave() = mac 0x1d0200, win 0xce3e0;
void fadeInMusic(const char*) = mac 0x1c2ff0, win 0xc4bd0;
void getBGTexture(int) = mac 0x1cca00;
void getFontFile(int) = mac 0x1cc5f0;
Expand Down Expand Up @@ -4953,7 +4953,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, CurrencyRewardDelegate,
void showCompleteEffect() = mac 0x738e0, win 0x1fe060;
void showCompleteText() = mac 0x73be0, win 0x1fda90;
void showEndLayer() = mac 0x74450, win 0x1ffd00;
void showHint() = mac 0x7deb0;
void showHint() = mac 0x7deb0, win 0x20a910;
void showNewBest(bool, int, int, bool, bool, bool) = mac 0x74580, win 0x1fe3a0;
void showRetryLayer() = mac 0x75ba0;
void showTwoPlayerGuide() = mac 0x6df00, win 0x2003b0;
Expand Down Expand Up @@ -5221,14 +5221,14 @@ class PlayerObject : GameObject, AnimatedSpriteDelegate {
return collidedWithObject(fl, obj, rect);
}
bool collidedWithObject(float, GameObject*, cocos2d::CCRect) = mac 0x21f0b0, win 0x1ebdd0;
bool collidedWithSlope(float, GameObject*, bool) = mac 0x21d8d0;
bool collidedWithSlope(float, GameObject*, bool) = mac 0x21d8d0, win 0x1ebc00;
void convertToClosestRotation(float) = mac 0x21c860, win 0x1e9ac0;
void copyAttributes(PlayerObject*) = mac 0x22dc70, win 0x1f93f0;
static PlayerObject* create(int, int, cocos2d::CCLayer*) = mac 0x217260, win 0x1e6cf0;
void deactivateParticle() = mac 0x21a540, win 0x1e8f50;
void deactivateStreak(bool) = mac 0x218b30;
void fadeOutStreak2(float) = mac 0x225890, win 0x1f9110;
void flashPlayer(float, float, cocos2d::_ccColor3B, cocos2d::_ccColor3B) = mac 0x221c80;
void flashPlayer(float, float, cocos2d::_ccColor3B, cocos2d::_ccColor3B) = mac 0x221c80, win 0x1eec50;
void flipGravity(bool, bool) = mac 0x21c090, win 0x1f59d0;
void flipMod() = mac 0x21a4c0;
void getActiveMode() = mac 0x22b950, win 0x1f5df0;
Expand All @@ -5250,7 +5250,7 @@ class PlayerObject : GameObject, AnimatedSpriteDelegate {
bool levelFlipping() = mac 0x21a510, win 0x1f6820;
void levelWillFlip() = mac 0x21b020;
void loadFromCheckpoint(PlayerCheckpoint*) = mac 0x22e420, win 0x1fa080;
void lockPlayer() = mac 0x22d680;
void lockPlayer() = mac 0x22d680, win 0x1f4f70;
void logValues() = mac 0x221220;
void modeDidChange() = mac 0x22bfd0;
void placeStreakPoint() = mac 0x21af90, win 0x1f95e0;
Expand Down Expand Up @@ -5319,7 +5319,7 @@ class PlayerObject : GameObject, AnimatedSpriteDelegate {
void updateCollideTop(float, int) = mac 0x221c20;
void updateDashAnimation() = mac 0x21a570, win 0x1eea80;
void updateDashArt() = mac 0x222520, win 0x1ee3c0;
void updateGlowColor() = mac 0x22cf10;
void updateGlowColor() = mac 0x22cf10, win 0x1f78e0;
void updateJump(float) = mac 0x219680, win 0x1e8f80;
void updateJumpVariables() = mac 0x21a740;
void updatePlayerBirdFrame(int) = mac 0x22bfe0, win 0x1f81a0;
Expand Down
Loading

0 comments on commit 2d16eb5

Please sign in to comment.