diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dacb26dec..212ba9f946 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 2.8) project (Cocos2d-X) # The version number -set(COCOS2D_X_VERSION 3.3.0-beta0) +set(COCOS2D_X_VERSION 3.3.0-rc1) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") include(CocosBuildHelpers) diff --git a/cocos/2d/CCFontAtlas.h b/cocos/2d/CCFontAtlas.h index 5c8d920eef..d045dd3cd1 100644 --- a/cocos/2d/CCFontAtlas.h +++ b/cocos/2d/CCFontAtlas.h @@ -107,8 +107,7 @@ public: */ void setAliasTexParameters(); -private: - +protected: void relaseTextures(); std::unordered_map _atlasTextures; std::unordered_map _fontLetterDefinitions; @@ -122,7 +121,6 @@ private: float _currentPageOrigX; float _currentPageOrigY; float _letterPadding; - bool _makeDistanceMap; int _fontAscender; EventListenerCustom* _rendererRecreatedListener; diff --git a/cocos/audio/apple/AudioEngine-inl.mm b/cocos/audio/apple/AudioEngine-inl.mm index bcb66149d1..609e2dce89 100644 --- a/cocos/audio/apple/AudioEngine-inl.mm +++ b/cocos/audio/apple/AudioEngine-inl.mm @@ -129,8 +129,8 @@ namespace cocos2d { AudioEngineImpl::AudioEngineImpl() : _lazyInitLoop(true) -, _currentAudioID(0) , _threadPool(nullptr) +, _currentAudioID(0) { } @@ -340,7 +340,7 @@ bool AudioEngineImpl::stop(int audioID) } } - alSourcei(player._alSource, AL_BUFFER, NULL); + alSourcei(player._alSource, AL_BUFFER, 0); _alSourceUsed[player._alSource] = false; _audioPlayers.erase(audioID); @@ -353,7 +353,7 @@ void AudioEngineImpl::stopAll() for(int index = 0; index < MAX_AUDIOINSTANCES; ++index) { alSourceStop(_alSources[index]); - alSourcei(_alSources[index], AL_BUFFER, NULL); + alSourcei(_alSources[index], AL_BUFFER, 0); _alSourceUsed[_alSources[index]] = false; } diff --git a/cocos/audio/apple/AudioPlayer.h b/cocos/audio/apple/AudioPlayer.h index 3b5a125784..9d2a455802 100644 --- a/cocos/audio/apple/AudioPlayer.h +++ b/cocos/audio/apple/AudioPlayer.h @@ -52,7 +52,7 @@ public: float getTime() { return _currTime;} bool setLoop(bool loop); -private: +protected: void rotateBufferThread(int offsetFrame); bool play2d(AudioCache* cache); diff --git a/cocos/audio/apple/AudioPlayer.mm b/cocos/audio/apple/AudioPlayer.mm index 81673fda19..d084e8e410 100644 --- a/cocos/audio/apple/AudioPlayer.mm +++ b/cocos/audio/apple/AudioPlayer.mm @@ -37,8 +37,8 @@ using namespace cocos2d::experimental; AudioPlayer::AudioPlayer() : _exitThread(false) -, _timeDirty(false) , _streamingSource(false) +, _timeDirty(false) , _currTime(0.0f) , _finishCallbak(nullptr) , _ready(false) diff --git a/cocos/audio/include/AudioEngine.h b/cocos/audio/include/AudioEngine.h index cd1f72e8b2..51e7540347 100644 --- a/cocos/audio/include/AudioEngine.h +++ b/cocos/audio/include/AudioEngine.h @@ -55,8 +55,8 @@ public: double minDelay; AudioProfile() - : minDelay(0.0) - , maxInstances(0) + : maxInstances(0) + , minDelay(0.0) { } diff --git a/cocos/cocos2d.cpp b/cocos/cocos2d.cpp index 111bb4bde6..3dc202f5ac 100644 --- a/cocos/cocos2d.cpp +++ b/cocos/cocos2d.cpp @@ -31,7 +31,7 @@ NS_CC_BEGIN CC_DLL const char* cocos2dVersion() { - return "cocos2d-x 3.3rc0"; + return "cocos2d-x 3.3rc1"; } NS_CC_END