diff --git a/bindings/Cocos2d.bro b/bindings/Cocos2d.bro index 2113cc49..73a34020 100644 --- a/bindings/Cocos2d.bro +++ b/bindings/Cocos2d.bro @@ -236,9 +236,12 @@ class cocos2d::CCEGLView { } class cocos2d::CCEGLViewProtocol { + CCEGLViewProtocol(); + virtual ~CCEGLViewProtocol(); auto getViewPortRect() const = mac 0x29e2f0; auto getScaleX() const = mac 0x29e300; auto getScaleY() const = mac 0x29e310; + virtual auto setDesignResolutionSize(float, float, ResolutionPolicy); } class cocos2d::CCFadeOut { diff --git a/loader/include/Geode/cocos/CCDirector.h b/loader/include/Geode/cocos/CCDirector.h index 385a137a..fb9c1d9b 100644 --- a/loader/include/Geode/cocos/CCDirector.h +++ b/loader/include/Geode/cocos/CCDirector.h @@ -458,7 +458,7 @@ protected: void setNextScene(void); void showStats(); - void createStatsLabel(); + RT_REMOVE(void createStatsLabel();) void calculateMPF(); void getFPSImageData(unsigned char** datapointer, unsigned int* length); diff --git a/loader/include/Geode/cocos/include/ccMacros.h b/loader/include/Geode/cocos/include/ccMacros.h index db902501..d0313fd6 100644 --- a/loader/include/Geode/cocos/include/ccMacros.h +++ b/loader/include/Geode/cocos/include/ccMacros.h @@ -245,7 +245,7 @@ It should work same as apples CFSwapInt32LittleToHost(..) Increments the GL Draws counts by one. The number of calls per frame are displayed on the screen when the CCDirector's stats are enabled. */ -extern unsigned int CC_DLL g_uNumberOfDraws; +extern unsigned int __declspec(dllimport) g_uNumberOfDraws; #define CC_INCREMENT_GL_DRAWS(__n__) g_uNumberOfDraws += __n__ /*******************/ diff --git a/loader/include/Geode/cocos/platform/CCEGLViewProtocol.h b/loader/include/Geode/cocos/platform/CCEGLViewProtocol.h index 095cb409..cdea5806 100644 --- a/loader/include/Geode/cocos/platform/CCEGLViewProtocol.h +++ b/loader/include/Geode/cocos/platform/CCEGLViewProtocol.h @@ -49,6 +49,7 @@ public: * @lua NA */ CCEGLViewProtocol(); + GEODE_CUSTOM_CONSTRUCTOR_BEGIN(CCEGLViewProtocol) /** * @lua NA */ @@ -57,22 +58,22 @@ public: /** Force destroying EGL view, subclass must implement this method. * @lua NA */ - virtual void end() = 0; + virtual void end() {} /** Get whether opengl render system is ready, subclass must implement this method. * @lua NA */ - virtual bool isOpenGLReady() = 0; + virtual bool isOpenGLReady() { return false; } /** Exchanges the front and back buffers, subclass must implement this method. * @lua NA */ - virtual void swapBuffers() = 0; + virtual void swapBuffers() {} /** Open or close IME keyboard , subclass must implement this method. * @lua NA */ - virtual void setIMEKeyboardState(bool bOpen) = 0; + virtual void setIMEKeyboardState(bool bOpen) {} /** * Get the frame size of EGL view.