diff --git a/bindings/2.206/Cocos2d.bro b/bindings/2.206/Cocos2d.bro index 469fcb0d3..aaaab184b 100644 --- a/bindings/2.206/Cocos2d.bro +++ b/bindings/2.206/Cocos2d.bro @@ -669,15 +669,17 @@ class cocos2d::CCFileUtils { [[link(win, android)]] class cocos2d::CCGLProgram { - bool initWithVertexShaderByteArray(char const*, char const*); + bool initWithVertexShaderByteArray(char const*, char const*) = m1 0x3a71ac; bool initWithVertexShaderFilename(char const*, char const*); unsigned int const getProgram(); - int getUniformLocationForName(char const*); + int getUniformLocationForName(char const* rndm) = win inline, m1 inline { + return glGetUniformLocation(m_uProgram, rndm); + } - void setUniformLocationWith1f(int, float); + void setUniformLocationWith1f(int, float) = m1 0x3a82b4; void setUniformLocationWith1i(int, int); - void setUniformLocationWith2f(int, float, float); + void setUniformLocationWith2f(int, float, float) = m1 0x3a8314; void setUniformLocationWith2fv(int, float*, unsigned int); void setUniformLocationWith2i(int, int, int); void setUniformLocationWith2iv(int, int*, unsigned int); @@ -694,17 +696,19 @@ class cocos2d::CCGLProgram { void setUniformsForBuiltins() = m1 0x3a8704, imac 0x435940, ios 0x13c230; // CCGLProgram(cocos2d::CCGLProgram const&); - // CCGLProgram(); - void addAttribute(char const*, unsigned int); + CCGLProgram() = m1 0x3a6fd8; + ~CCGLProgram() = m1 0x3a7018; + + void addAttribute(char const*, unsigned int) = m1 0x3a744c; bool compileShader(unsigned int*, unsigned int, char const*); char const* description(); char const* fragmentShaderLog(); - bool link(); + bool link() = m1 0x3a75e8; // char const* logForOpenGLObject(unsigned int, void (__cdecl*)(unsigned int, unsigned int, int*), void (__cdecl*)(unsigned int, int, int*, char*)); char const* programLog(); void reset() = m1 0x3a89bc, imac 0x435c70; - bool updateUniformLocation(int, void*, unsigned int); - void updateUniforms(); + bool updateUniformLocation(int, void*, unsigned int) = m1 0x3a7b14; + void updateUniforms() = m1 0x3a7460; void use() = m1 0x3a758c, imac 0x434970, ios 0x13b990; char const* vertexShaderLog(); } @@ -712,7 +716,7 @@ class cocos2d::CCGLProgram { [[link(win, android)]] class cocos2d::CCNode { static cocos2d::CCNode* create() = imac 0x26ee60, m1 0x215170, ios 0x24bbfc; - static void resetGlobalOrderOfArrival(); + static void resetGlobalOrderOfArrival() = m1 0x214850; // CCNode(cocos2d::CCNode const&); CCNode() = imac 0x26e330, m1 0x214860, ios 0x24b328; @@ -740,7 +744,7 @@ class cocos2d::CCNode { void detachChild(cocos2d::CCNode*, bool); void insertChild(cocos2d::CCNode*, int); unsigned int numberOfRunningActions(); - void pauseSchedulerAndActions(); + void pauseSchedulerAndActions() = m1 0x2162fc; void qsortAllChildrenWithIndex() = m1 0x215ce4, imac 0x26f9b0; void resumeSchedulerAndActions() = ios 0x24c6fc, imac 0x26fd80, m1 0x2160c4; cocos2d::CCAction* runAction(cocos2d::CCAction*) = imac 0x2700d0, m1 0x216408, ios 0x24ca08; @@ -1404,7 +1408,7 @@ class cocos2d::CCKeyboardDispatcher { void forceAddDelegate(cocos2d::CCKeyboardDelegate*); void forceRemoveDelegate(cocos2d::CCKeyboardDelegate*); char const* keyToString(cocos2d::enumKeyCodes) = m1 0x1b06d8, imac 0x1fdeb0; - void removeDelegate(cocos2d::CCKeyboardDelegate*); + void removeDelegate(cocos2d::CCKeyboardDelegate*) = m1 0x1b0228; void updateModifierKeys(bool, bool, bool, bool) = m1 0x1b06c0, imac 0x1fde80; } @@ -1436,7 +1440,7 @@ class cocos2d::CCDirector { int getSmoothFixCounter() const; unsigned int getTotalFrames(); cocos2d::CCPoint getVisibleOrigin(); - cocos2d::CCSize getVisibleSize(); + cocos2d::CCSize getVisibleSize() = m1 0x3f2538; cocos2d::CCSize getWinSize() = m1 0x3f1edc, imac 0x48c750, ios 0x1818b4; cocos2d::CCSize getWinSizeInPixels(); float getZEye(); @@ -1769,8 +1773,8 @@ class cocos2d::CCApplication { class cocos2d::CCArray { // static cocos2d::CCArray* create(cocos2d::CCObject*, ...); // static cocos2d::CCArray* create() = imac 0x72cc40, m1 0x63f894, ios 0x2599ec; - // static cocos2d::CCArray* createWithArray(cocos2d::CCArray*) = m1 0x63faac; - // static cocos2d::CCArray* createWithCapacity(unsigned int) = ios 0x259b9c; + static cocos2d::CCArray* createWithArray(cocos2d::CCArray*) = m1 0x63faac; + static cocos2d::CCArray* createWithCapacity(unsigned int) = ios 0x259b9c; static cocos2d::CCArray* createWithContentsOfFile(char const*); static cocos2d::CCArray* createWithContentsOfFileThreadSafe(char const*); static cocos2d::CCArray* createWithObject(cocos2d::CCObject*); @@ -1892,7 +1896,7 @@ class cocos2d::CCRenderTexture { cocos2d::CCImage* newCCImage(bool) = m1 0x527a30, imac 0x600c30; bool saveToFile(char const*); bool saveToFile(char const*, cocos2d::eImageFormat); - void updateInternalScale(float, float); + void updateInternalScale(float, float) = m1 0x5270b8; virtual void draw() = m1 0x527814, imac 0x600980; virtual void visit() = m1 0x527788, imac 0x6008f0; @@ -2036,12 +2040,12 @@ class cocos2d::CCClippingNode : cocos2d::CCNode { return nullptr; } - CCClippingNode() = ios inline { + CCClippingNode() = m1 0x63ef58, ios inline { m_pStencil = nullptr; m_fAlphaThreshold = 0.0f; m_bInverted = false; } - virtual ~CCClippingNode() = ios inline { + virtual ~CCClippingNode() = m1 0x63efb0, ios inline { CC_SAFE_RELEASE(m_pStencil); } @@ -2487,6 +2491,34 @@ class cocos2d::CCMenuItemSprite { virtual void updateImagesVisibility() = imac 0x3c3880, m1 0x346c7c, ios 0x537c4; } +[[link(win, android)]] +class cocos2d::CCMenuItemImage { + static cocos2d::CCMenuItemImage* create(const char *normalImage, const char *selectedImage) = m1 0x3470dc; + static cocos2d::CCMenuItemImage* create(const char *normalImage, const char *selectedImage, const char *disabledImage) = m1 0x3472fc; + static cocos2d::CCMenuItemImage* create(const char *normalImage, const char *selectedImage, CCObject* target, SEL_MenuHandler selector) = m1 0x347244; + static cocos2d::CCMenuItemImage* create(const char *normalImage, const char *selectedImage, const char *disabledImage, CCObject* target, SEL_MenuHandler selector) = m1 0x347180; + + bool init() = m1 0x346ea4; + bool initWithNormalImage(const char *normalImage, const char *selectedImage, const char *disabledImage, CCObject* target, SEL_MenuHandler selector) = m1 0x346f8c; + void setNormalSpriteFrame(CCSpriteFrame* frame); + void setSelectedSpriteFrame(CCSpriteFrame* frame); + void setDisabledSpriteFrame(CCSpriteFrame* frame); + + static cocos2d::CCMenuItemImage* create() = m1 inline { + cocos2d::CCMenuItemImage* pRet = new CCMenuItemImage(); + if (pRet && pRet->init()) + { + pRet->autorelease(); + } + else + { + CC_SAFE_DELETE(pRet); + } + return pRet; + } +} + + [[link(win, android)]] class cocos2d::CCMenu { // static cocos2d::CCMenu* create(cocos2d::CCMenuItem*, ...) = ios 0x1e1964, m1 0x6a6d58, imac 0x79e7b0; @@ -2578,8 +2610,8 @@ class cocos2d::CCTextFieldTTF { virtual void setSecureTextEntry(bool value); virtual bool isSecureTextEntry(); - virtual void setString(const char* text); - virtual const char* getString(); + virtual void setString(const char* text) = m1 0x21e6fc; + virtual const char* getString() = m1 0x21e970; virtual bool attachWithIME(); virtual bool detachWithIME(); diff --git a/test/members/MacOSArm.cpp b/test/members/MacOSArm.cpp index 68a4bc59d..a28683258 100644 --- a/test/members/MacOSArm.cpp +++ b/test/members/MacOSArm.cpp @@ -61,10 +61,152 @@ GEODE_MEMBER_CHECK(PlayerObject, m_gameLayer, 0xbc0); // GEODE_MEMBER_CHECK(PlayerObject, m_platformerXVelocity, 0xa28); // GEODE_MEMBER_CHECK(PlayerObject, m_isPlatformer, 0xaa0); +GEODE_SIZE_CHECK(ShaderLayer, 0x620); +GEODE_MEMBER_CHECK(ShaderLayer, m_antiAlias, 0x450); +GEODE_MEMBER_CHECK(ShaderLayer, m_configuredAntiAlias, 0x451); +GEODE_MEMBER_CHECK(ShaderLayer, m_state, 0x198); +GEODE_MEMBER_CHECK(ShaderLayer, m_shader, 0x438); +GEODE_MEMBER_CHECK(ShaderLayer, m_gameLayer, 0x460); +GEODE_MEMBER_CHECK(ShaderLayer, m_renderTexture, 0x440); +GEODE_MEMBER_CHECK(ShaderLayer, m_sprite, 0x448); +GEODE_MEMBER_CHECK(ShaderLayer, m_textureContentSize, 0x478); +GEODE_MEMBER_CHECK(ShaderLayer, m_targetTextureSizeExtra, 0x488); +GEODE_MEMBER_CHECK(ShaderLayer, m_textureScaleUniform, 0x490); +GEODE_MEMBER_CHECK(ShaderLayer, m_textureScaleInvUniform, 0x494); +GEODE_MEMBER_CHECK(ShaderLayer, m_shaderPositionUniform, 0x498); +GEODE_MEMBER_CHECK(ShaderLayer, m_blurRefColorUniform, 0x49c); +GEODE_MEMBER_CHECK(ShaderLayer, m_blurUseRefUniform, 0x4a0); +GEODE_MEMBER_CHECK(ShaderLayer, m_blurIntensityUniform, 0x4a4); +GEODE_MEMBER_CHECK(ShaderLayer, m_blurOnlyEmptyUniform, 0x4a8); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveTimeUniform, 0x4ac); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveTime1Uniform, 0x4b0); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveTime2Uniform, 0x4b4); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveTime3Uniform, 0x4b8); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveTime4Uniform, 0x4bc); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveStrengthUniform, 0x4c0); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveWavesUniform, 0x4c4); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveCenterUniform, 0x4c8); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveInvertUniform, 0x4cc); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveMinSizeUniform, 0x4d0); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveMaxSizeUniform, 0x4d4); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveMaxDistValUniform, 0x4d8); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveTime1, 0x4dc); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveTime2, 0x4e0); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveTime3, 0x4e4); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveTime4, 0x4e8); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveMaxDistVal, 0x4ec); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveMinSize, 0x4f0); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveMaxSize, 0x4f4); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockWaveUnk46c, 0x4f8); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineTimeUniform, 0x4fc); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineTime1Uniform, 0x500); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineTime2Uniform, 0x504); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineTime3Uniform, 0x508); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineTime4Uniform, 0x50c); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineAxisUniform, 0x510); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineDirectionUniform, 0x514); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineDualUniform, 0x518); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineWavesUniform, 0x51c); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineStrengthUniform, 0x520); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineCenterUniform, 0x524); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineMaxDistValUniform, 0x528); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineTime1, 0x52c); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineTime2, 0x530); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineTime3, 0x534); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineTime4, 0x538); +GEODE_MEMBER_CHECK(ShaderLayer, m_shockLineMaxDistVal, 0x53c); +GEODE_MEMBER_CHECK(ShaderLayer, m_unk4b4, 0x540); +GEODE_MEMBER_CHECK(ShaderLayer, m_unk4b8, 0x544); +GEODE_MEMBER_CHECK(ShaderLayer, m_unk4bc, 0x548); +GEODE_MEMBER_CHECK(ShaderLayer, m_glitchBotUniform, 0x54c); +GEODE_MEMBER_CHECK(ShaderLayer, m_glitchTopUniform, 0x550); +GEODE_MEMBER_CHECK(ShaderLayer, m_glitchXOffsetUniform, 0x554); +GEODE_MEMBER_CHECK(ShaderLayer, m_glitchColOffsetUniform, 0x558); +GEODE_MEMBER_CHECK(ShaderLayer, m_glitchRndUniform, 0x55c); +GEODE_MEMBER_CHECK(ShaderLayer, m_chromaticXOffUniform, 0x560); +GEODE_MEMBER_CHECK(ShaderLayer, m_chromaticYOffUniform, 0x564); +GEODE_MEMBER_CHECK(ShaderLayer, m_cGRGBOffsetUniform, 0x568); +GEODE_MEMBER_CHECK(ShaderLayer, m_cGYOffsetUniform, 0x56c); +GEODE_MEMBER_CHECK(ShaderLayer, m_cGTimeUniform, 0x570); +GEODE_MEMBER_CHECK(ShaderLayer, m_cGStrengthUniform, 0x574); +GEODE_MEMBER_CHECK(ShaderLayer, m_cGHeightUniform, 0x578); +GEODE_MEMBER_CHECK(ShaderLayer, m_cGLineThickUniform, 0x57c); +GEODE_MEMBER_CHECK(ShaderLayer, m_cGLineStrengthUniform, 0x580); +GEODE_MEMBER_CHECK(ShaderLayer, m_lensCircleOriginUniform, 0x584); +GEODE_MEMBER_CHECK(ShaderLayer, m_lensCircleStartUniform, 0x588); +GEODE_MEMBER_CHECK(ShaderLayer, m_lensCircleEndUniform, 0x58c); +GEODE_MEMBER_CHECK(ShaderLayer, m_lensCircleStrengthUniform, 0x590); +GEODE_MEMBER_CHECK(ShaderLayer, m_lensCircleTintUniform, 0x594); +GEODE_MEMBER_CHECK(ShaderLayer, m_lensCircleAdditiveUniform, 0x598); +GEODE_MEMBER_CHECK(ShaderLayer, m_radialBlurCenterUniform, 0x59c); +GEODE_MEMBER_CHECK(ShaderLayer, m_radialBlurValueUniform, 0x5a0); +GEODE_MEMBER_CHECK(ShaderLayer, m_blurFadeUniform, 0x5a4); +GEODE_MEMBER_CHECK(ShaderLayer, m_motionBlurValueUniform, 0x5a8); +GEODE_MEMBER_CHECK(ShaderLayer, m_motionBlurMultUniform, 0x5ac); +GEODE_MEMBER_CHECK(ShaderLayer, m_motionBlurDualUniform, 0x5b0); +GEODE_MEMBER_CHECK(ShaderLayer, m_bulgeValueUniform, 0x5b4); +GEODE_MEMBER_CHECK(ShaderLayer, m_bulgeValue2Uniform, 0x5b8); +GEODE_MEMBER_CHECK(ShaderLayer, m_bulgeOriginUniform, 0x5bc); +GEODE_MEMBER_CHECK(ShaderLayer, m_bulgeRadiusUniform, 0x5c0); +GEODE_MEMBER_CHECK(ShaderLayer, m_pinchValueUniform, 0x5c4); +GEODE_MEMBER_CHECK(ShaderLayer, m_pinchCenterPosUniform, 0x5c8); +GEODE_MEMBER_CHECK(ShaderLayer, m_pinchCalcUniform, 0x5cc); +GEODE_MEMBER_CHECK(ShaderLayer, m_pinchRadiusUniform, 0x5d0); +GEODE_MEMBER_CHECK(ShaderLayer, m_grayscaleValueUniform, 0x5d4); +GEODE_MEMBER_CHECK(ShaderLayer, m_grayscaleTintUniform, 0x5d8); +GEODE_MEMBER_CHECK(ShaderLayer, m_grayscaleUseLumUniform, 0x5dc); +GEODE_MEMBER_CHECK(ShaderLayer, m_sepiaValueUniform, 0x5e0); +GEODE_MEMBER_CHECK(ShaderLayer, m_invertColorValueUniform, 0x5e4); +GEODE_MEMBER_CHECK(ShaderLayer, m_hueShiftCosAUniform, 0x5e8); +GEODE_MEMBER_CHECK(ShaderLayer, m_hueShiftSinAUniform, 0x5ec); +GEODE_MEMBER_CHECK(ShaderLayer, m_colorChangeCUniform, 0x5f0); +GEODE_MEMBER_CHECK(ShaderLayer, m_colorChangeBUniform, 0x5f4); +GEODE_MEMBER_CHECK(ShaderLayer, m_rowmodUniform, 0x5f8); +GEODE_MEMBER_CHECK(ShaderLayer, m_colmodUniform, 0x5fc); +GEODE_MEMBER_CHECK(ShaderLayer, m_rowmodCalcUniform, 0x600); +GEODE_MEMBER_CHECK(ShaderLayer, m_colmodCalcUniform, 0x604); +GEODE_MEMBER_CHECK(ShaderLayer, m_splitXStartUniform, 0x608); +GEODE_MEMBER_CHECK(ShaderLayer, m_splitXRangeUniform, 0x60c); +GEODE_MEMBER_CHECK(ShaderLayer, m_splitXRangeMultUniform, 0x610); +GEODE_MEMBER_CHECK(ShaderLayer, m_splitYStartUniform, 0x614); +GEODE_MEMBER_CHECK(ShaderLayer, m_splitYRangeUniform, 0x618); +GEODE_MEMBER_CHECK(ShaderLayer, m_splitYRangeMultUniform, 0x61c); + +GEODE_SIZE_CHECK(CCTextInputNode, 0x258); +GEODE_MEMBER_CHECK(CCTextInputNode, m_numberInput, 0x1a8); +GEODE_MEMBER_CHECK(CCTextInputNode, m_caption, 0x1b0); +GEODE_MEMBER_CHECK(CCTextInputNode, m_unknown1, 0x1c8); +GEODE_MEMBER_CHECK(CCTextInputNode, m_selected, 0x1cc); +GEODE_MEMBER_CHECK(CCTextInputNode, m_unknown2, 0x1cd); +GEODE_MEMBER_CHECK(CCTextInputNode, m_fontValue1, 0x1d0); +GEODE_MEMBER_CHECK(CCTextInputNode, m_fontValue2, 0x1d4); +GEODE_MEMBER_CHECK(CCTextInputNode, m_isChatFont, 0x1d8); +GEODE_MEMBER_CHECK(CCTextInputNode, m_allowedChars, 0x1e0); +GEODE_MEMBER_CHECK(CCTextInputNode, m_maxLabelWidth, 0x1f8); +GEODE_MEMBER_CHECK(CCTextInputNode, m_maxLabelScale, 0x1fc); +GEODE_MEMBER_CHECK(CCTextInputNode, m_placeholderScale, 0x200); +GEODE_MEMBER_CHECK(CCTextInputNode, m_placeholderColor, 0x204); +GEODE_MEMBER_CHECK(CCTextInputNode, m_textColor, 0x207); +GEODE_MEMBER_CHECK(CCTextInputNode, m_cursor, 0x210); +GEODE_MEMBER_CHECK(CCTextInputNode, m_textField, 0x218); +GEODE_MEMBER_CHECK(CCTextInputNode, m_delegate, 0x220); +GEODE_MEMBER_CHECK(CCTextInputNode, m_maxLabelLength, 0x228); +GEODE_MEMBER_CHECK(CCTextInputNode, m_placeholderLabel, 0x230); +GEODE_MEMBER_CHECK(CCTextInputNode, m_filterSwearWords, 0x238); +GEODE_MEMBER_CHECK(CCTextInputNode, m_usePasswordChar, 0x239); +GEODE_MEMBER_CHECK(CCTextInputNode, m_forceOffset, 0x23a); +GEODE_MEMBER_CHECK(CCTextInputNode, m_textArea, 0x240); +GEODE_MEMBER_CHECK(CCTextInputNode, m_valueType, 0x248); +GEODE_MEMBER_CHECK(CCTextInputNode, m_decimalPlaces, 0x24c); +GEODE_MEMBER_CHECK(CCTextInputNode, m_kerningAmount, 0x250); + +GEODE_SIZE_CHECK(GJShaderState, 0x298); +GEODE_MEMBER_CHECK(GJShaderState, m_pixelateTargetX, 0x16c); +GEODE_MEMBER_CHECK(GJShaderState, m_pixelateTargetY, 0x170); GEODE_SIZE_CHECK(CCTextInputNode, 0x258); GEODE_SIZE_CHECK(CCLightFlash, 0x168); GEODE_SIZE_CHECK(CCLightStrip, 0x160); -#endif +#endif \ No newline at end of file