Compilation fix (cocos2d#17209)

* Fix various compilation issues.

Mostly errors on field initialization order but also missing files
in CMakeLists and missing include directives.

* Fix compilations issues with GCC 6.2

* Fix gitignore libs/ entry to not ignore the Android external libraries.

Author: j-jorge

.gitignore

@@ -43,7 +43,7 @@ BundleArtifacts
 *.VC.db
 
 # Ignore files build by ndk and eclipse
-libs/
+/libs/
 bin/
 obj/
 gen/

cocos/3d/CCMesh.cpp

@@ -125,13 +125,12 @@ Mesh::Mesh()
 : _skin(nullptr)
 , _visible(true)
 , _isTransparent(false)
+, _force2DQueue(false)
 , _meshIndexData(nullptr)
-, _material(nullptr)
 , _glProgramState(nullptr)
 , _blend(BlendFunc::ALPHA_NON_PREMULTIPLIED)
-, _visibleChanged(nullptr)
 , _blendDirty(true)
-, _force2DQueue(false)
+, _material(nullptr)
 , _texFile("")
 {
 

cocos/audio/CMakeLists.txt

@@ -41,6 +41,7 @@ elseif(MACOSX)
     set(COCOS_AUDIO_PLATFORM_SRC
         ${COCOS_AUDIO_PLATFORM_SRC_C}
         audio/apple/AudioCache.mm
+        audio/apple/AudioDecoder.mm
         audio/apple/AudioEngine-inl.mm
         audio/apple/AudioPlayer.mm
         audio/mac/SimpleAudioEngine.mm

cocos/audio/android/AudioEngine-inl.cpp

@@ -107,14 +107,14 @@ static int fdGetter(const std::string& url, off_t* start, off_t* length)
 
 //====================================================
 AudioEngineImpl::AudioEngineImpl()
-    : _audioIDIndex(0)
-    , _engineObject(nullptr)
+    : _engineObject(nullptr)
     , _engineEngine(nullptr)
     , _outputMixObject(nullptr)
-    , _lazyInitLoop(true)
     , _audioPlayerProvider(nullptr)
     , _onPauseListener(nullptr)
     , _onResumeListener(nullptr)
+    , _audioIDIndex(0)
+    , _lazyInitLoop(true)
 {
     __callerThreadUtils.setCallerThreadId(std::this_thread::get_id());
 }

cocos/audio/android/CCThreadPool.cpp

@@ -102,7 +102,7 @@ ThreadPool *ThreadPool::newSingleThreadPool()
 }
 
 ThreadPool::ThreadPool(int minNum, int maxNum)
-        : _isStop(false), _isDone(false), _idleThreadNum(0), _minThreadNum(minNum),
+        : _isDone(false), _isStop(false), _idleThreadNum(0), _minThreadNum(minNum),
           _maxThreadNum(maxNum), _initedThreadNum(0), _shrinkInterval(DEFAULT_SHRINK_INTERVAL),
           _shrinkStep(DEFAULT_SHRINK_STEP), _stretchStep(DEFAULT_STRETCH_STEP),
           _isFixedSize(false)

cocos/audio/apple/AudioCache.mm

@@ -70,10 +70,10 @@ static ALvoid  alBufferDataStaticProc(const ALint bid, ALenum format, ALvoid* da
 using namespace cocos2d::experimental;
 
 AudioCache::AudioCache()
-: _totalFrames(0)
-, _framesRead(0)
-, _format(-1)
+: _format(-1)
 , _duration(0.0f)
+, _totalFrames(0)
+, _framesRead(0)
 , _alBufferId(INVALID_AL_BUFFER_ID)
 , _pcmData(nullptr)
 , _queBufferFrames(0)

cocos/audio/apple/AudioDecoder.mm

@@ -25,6 +25,8 @@ of this software and associated documentation files (the "Software"), to deal
 #include "audio/apple/AudioDecoder.h"
 #include "audio/apple/AudioMacros.h"
 
+#import <Foundation/Foundation.h>
+
 #define LOG_TAG "AudioDecoder"
 
 namespace cocos2d { namespace experimental {

cocos/audio/apple/AudioPlayer.mm

@@ -128,7 +128,7 @@ of this software and associated documentation files (the "Software"), to deal
     ALOGVV("Before alSourceStop");
     alSourceStop(_alSource); CHECK_AL_ERROR_DEBUG();
     ALOGVV("Before alSourcei");
-    alSourcei(_alSource, AL_BUFFER, NULL); CHECK_AL_ERROR_DEBUG();
+    alSourcei(_alSource, AL_BUFFER, 0); CHECK_AL_ERROR_DEBUG();
 
     _removeByAudioEngine = true;
 

cocos/base/CCConfiguration.cpp

@@ -334,7 +334,8 @@ const Value& Configuration::getValue(const std::string& key, const Value& defaul
     auto iter = _valueDict.find(key);
     if (iter != _valueDict.cend())
         return _valueDict.at(key);
-	return defaultValue;
+
+    return defaultValue;
 }
 
 void Configuration::setValue(const std::string& key, const Value& value)

cocos/base/CCProperties.cpp

@@ -43,15 +43,16 @@ void calculateNamespacePath(const std::string& urlString, std::string& fileStrin
 Properties* getPropertiesFromNamespacePath(Properties* properties, const std::vector<std::string>& namespacePath);
 
 Properties::Properties()
-: _variables(nullptr), _dirPath(nullptr), _parent(nullptr), _dataIdx(nullptr), _data(nullptr)
+    :  _dataIdx(nullptr), _data(nullptr), _variables(nullptr), _dirPath(nullptr), _parent(nullptr)
 {
     _properties.reserve(32);
 }
 
 Properties::Properties(const Properties& copy)
-    : _namespace(copy._namespace), _id(copy._id), _parentID(copy._parentID), _properties(copy._properties),
-      _variables(nullptr), _dirPath(nullptr), _parent(copy._parent),
-      _dataIdx(copy._dataIdx), _data(copy._data)
+    : _dataIdx(copy._dataIdx), _data(copy._data), _namespace(copy._namespace),
+      _id(copy._id), _parentID(copy._parentID), _properties(copy._properties),
+      _variables(nullptr), _dirPath(nullptr), _parent(copy._parent)
+      
 {
     setDirectoryPath(copy._dirPath);
 
@@ -63,14 +64,14 @@ Properties::Properties(const Properties& copy)
 }
 
 Properties::Properties(Data* data, ssize_t* dataIdx)
-    : _variables(NULL), _dirPath(NULL), _parent(NULL), _dataIdx(dataIdx), _data(data)
+    : _dataIdx(dataIdx), _data(data), _variables(NULL), _dirPath(NULL), _parent(NULL)
 {
     readProperties();
     rewind();
 }
 
 Properties::Properties(Data* data, ssize_t* dataIdx, const std::string& name, const char* id, const char* parentID, Properties* parent)
-    : _namespace(name), _variables(NULL), _dirPath(NULL), _parent(parent), _dataIdx(dataIdx), _data(data)
+    : _dataIdx(dataIdx), _data(data), _namespace(name), _variables(NULL), _dirPath(NULL), _parent(parent)
 {
     if (id)
     {

cocos/deprecated/CCArray.cpp

@@ -350,7 +350,8 @@ __Array* __Array::clone() const
     Ref* obj = nullptr;
     Ref* tmpObj = nullptr;
     Clonable* clonable = nullptr;
-    CCARRAY_FOREACH(this, obj)
+    const __Array* self( this );
+    CCARRAY_FOREACH(self, obj)
     {
         clonable = dynamic_cast<Clonable*>(obj);
         if (clonable)

cocos/navmesh/CCNavMeshAgent.cpp

@@ -40,9 +40,9 @@ NavMeshAgentParam::NavMeshAgentParam()
 , maxSpeed(3.5f)
 , collisionQueryRange(radius * 12.0f)
 , pathOptimizationRange(radius * 30.0f)
+, separationWeight(2.0f)
 , updateFlags(DT_CROWD_ANTICIPATE_TURNS | DT_CROWD_OPTIMIZE_VIS | DT_CROWD_OPTIMIZE_TOPO | DT_CROWD_OBSTACLE_AVOIDANCE)
 , obstacleAvoidanceType(3)
-, separationWeight(2.0f)
 , queryFilterType(0)
 {
 
@@ -67,17 +67,17 @@ const std::string& NavMeshAgent::getNavMeshAgentComponentName()
 }
 
 cocos2d::NavMeshAgent::NavMeshAgent()
-    : _agentID(-1)
+    : _syncFlag(NODE_AND_NODE)
+    , _rotRefAxes(Vec3::UNIT_Z)
+    , _state(DT_CROWDAGENT_STATE_WALKING)
     , _needAutoOrientation(true)
-    , _crowd(nullptr)
+    , _agentID(-1)
     , _needUpdateAgent(true)
     , _needMove(false)
-    , _navMeshQuery(nullptr)
-    , _rotRefAxes(Vec3::UNIT_Z)
     , _totalTimeAfterMove(0.0f)
     , _userData(nullptr)
-    , _state(DT_CROWDAGENT_STATE_WALKING)
-    , _syncFlag(NODE_AND_NODE)
+    , _crowd(nullptr)
+    , _navMeshQuery(nullptr)
 {
 
 }

cocos/navmesh/CCNavMeshDebugDraw.cpp

@@ -34,10 +34,10 @@
 NS_CC_BEGIN
 
 NavMeshDebugDraw::NavMeshDebugDraw()
-: _primitiveType(GL_POINTS)
-, _dirtyBuffer(true)
-, _currentPrimitive(nullptr)
+: _currentPrimitive(nullptr)
+, _primitiveType(GL_POINTS)
 , _currentDepthMask(true)
+, _dirtyBuffer(true)
 {
     _stateBlock = RenderState::StateBlock::create();
     _stateBlock->setCullFace(true);

cocos/navmesh/CCNavMeshObstacle.cpp

@@ -53,9 +53,9 @@ const std::string& NavMeshObstacle::getNavMeshObstacleComponentName()
 NavMeshObstacle::NavMeshObstacle()
 : _radius(0.0f)
 , _height(0.0f)
-, _tileCache(nullptr)
-, _obstacleID(-1)
 , _syncFlag(NODE_AND_NODE)
+, _obstacleID(-1)
+, _tileCache(nullptr)
 {
 
 }

cocos/network/CCDownloader-apple.mm

@@ -30,7 +30,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 ////////////////////////////////////////////////////////////////////////////////
 //  OC Classes Declaration
-#import <Foundation/NSData.h>
+#import <Foundation/Foundation.h>
 
 // this wrapper used to wrap C++ class DownloadTask into NSMutableDictionary
 @interface DownloadTaskWrapper : NSObject

cocos/network/CMakeLists.txt

@@ -13,6 +13,10 @@ if(ANDROID)
    set(COCOS_NETWORK_PLATFORM_SRC
         network/CCDownloader-android.cpp
         )
+elseif(MACOSX)
+   set(COCOS_NETWORK_PLATFORM_SRC
+        network/CCDownloader-apple.mm
+        )
 endif()
 
 set(COCOS_NETWORK_SRC

cocos/network/HttpClient-android.cpp

@@ -85,8 +85,8 @@ class HttpURLConnection
 {
 public:
     HttpURLConnection(HttpClient* httpClient)
-    :_httpURLConnection(nullptr)
-    ,_client(httpClient)
+    :_client(httpClient)
+    ,_httpURLConnection(nullptr)
     ,_requestmethod("")
     ,_responseCookies("")
     ,_cookieFileName("")
@@ -874,12 +874,12 @@ void HttpClient::setSSLVerification(const std::string& caFile)
 }
 
 HttpClient::HttpClient()
-: _timeoutForConnect(30)
+: _isInited(false)
+, _timeoutForConnect(30)
 , _timeoutForRead(60)
-, _isInited(false)
 , _threadCount(0)
-, _requestSentinel(new HttpRequest())
 , _cookie(nullptr)
+, _requestSentinel(new HttpRequest())
 {
     CCLOG("In the constructor of HttpClient!");
     increaseThreadCount();

cocos/network/HttpClient-apple.mm

@@ -364,12 +364,12 @@ static int processTask(HttpClient* client, HttpRequest* request, NSString* reque
 }
 
 HttpClient::HttpClient()
-: _timeoutForConnect(30)
+: _isInited(false)
+, _timeoutForConnect(30)
 , _timeoutForRead(60)
-, _isInited(false)
 , _threadCount(0)
-, _requestSentinel(new HttpRequest())
 , _cookie(nullptr)
+, _requestSentinel(new HttpRequest())
 {
     CCLOG("In the constructor of HttpClient!");
     memset(_responseMessage, 0, sizeof(char) * RESPONSE_BUFFER_SIZE);

cocos/network/HttpClient.cpp

@@ -396,12 +396,12 @@ void HttpClient::setSSLVerification(const std::string& caFile)
 }
 
 HttpClient::HttpClient()
-: _timeoutForConnect(30)
+: _isInited(false)
+, _timeoutForConnect(30)
 , _timeoutForRead(60)
-, _isInited(false)
 , _threadCount(0)
-, _requestSentinel(new HttpRequest())
 , _cookie(nullptr)
+, _requestSentinel(new HttpRequest())
 {
 	CCLOG("In the constructor of HttpClient!");
 	memset(_responseMessage, 0, RESPONSE_BUFFER_SIZE * sizeof(char));

cocos/platform/android/CCDevice-android.cpp

@@ -70,9 +70,9 @@ class BitmapDC
 public:
 
     BitmapDC()
-    : _data(nullptr)
-    , _width(0)
+    : _width(0)
     , _height(0)
+    , _data(nullptr)
     {
     }
 

cocos/renderer/CCFrameBuffer.cpp

@@ -140,8 +140,8 @@ RenderTarget::~RenderTarget()
 }
 
 RenderTargetRenderBuffer::RenderTargetRenderBuffer()
-: _colorBuffer(0)
-, _format(GL_RGBA4)
+: _format(GL_RGBA4)
+, _colorBuffer(0)
 #if CC_ENABLE_CACHE_TEXTURE_DATA
 , _reBuildRenderBufferListener(nullptr)
 #endif
@@ -382,14 +382,14 @@ bool FrameBuffer::init(uint8_t fid, unsigned int width, unsigned int height)
 }
 
 FrameBuffer::FrameBuffer()
-: _clearColor(Color4F(0, 0, 0, 1))
+: _fbo(0)
+, _previousFBO(0)
+, _fboBindingDirty(true)
+, _clearColor(Color4F(0, 0, 0, 1))
 , _clearDepth(1.0)
 , _clearStencil(0)
-, _fbo(0)
-, _previousFBO(0)
 , _rt(nullptr)
 , _rtDepthStencil(nullptr)
-, _fboBindingDirty(true)
 , _isDefault(false)
 #if CC_ENABLE_CACHE_TEXTURE_DATA
 , _dirtyFBOListener(nullptr)

cocos/renderer/CCMaterial.cpp

@@ -419,8 +419,8 @@ std::string Material::getName() const
 
 Material::Material()
 : _name("")
-, _target(nullptr)
 , _currentTechnique(nullptr)
+, _target(nullptr)
 {
 }
 

cocos/renderer/CCMeshCommand.cpp

@@ -45,15 +45,15 @@ NS_CC_BEGIN
 
 
 MeshCommand::MeshCommand()
-: _textureID(0)
-, _glProgramState(nullptr)
-, _displayColor(1.0f, 1.0f, 1.0f, 1.0f)
+: _displayColor(1.0f, 1.0f, 1.0f, 1.0f)
 , _matrixPalette(nullptr)
 , _matrixPaletteSize(0)
 , _materialID(0)
 , _vao(0)
 , _material(nullptr)
+, _glProgramState(nullptr)
 , _stateBlock(nullptr)
+, _textureID(0)
 {
     _type = RenderCommand::Type::MESH_COMMAND;
 

cocos/renderer/CCRenderState.cpp

@@ -39,10 +39,10 @@ RenderState::StateBlock* RenderState::StateBlock::_defaultState = nullptr;
 
 
 RenderState::RenderState()
-: _texture(nullptr)
-, _hash(0)
+: _hash(0)
 , _hashDirty(true)
 , _parent(nullptr)
+, _texture(nullptr)
 {
     _state = StateBlock::create();
     CC_SAFE_RETAIN(_state);
@@ -915,4 +915,4 @@ void RenderState::StateBlock::setDepthFunction(DepthFunction func)
 //    }
 //}
 
-NS_CC_END
+NS_CC_END

cocos/renderer/CCTextureCache.cpp

@@ -733,13 +733,13 @@ bool VolatileTextureMgr::_isReloading = false;
 
 VolatileTexture::VolatileTexture(Texture2D *t)
 : _texture(t)
+, _uiImage(nullptr)
 , _cashedImageType(kInvalid)
 , _textureData(nullptr)
 , _pixelFormat(Texture2D::PixelFormat::RGBA8888)
 , _fileName("")
-, _text("")
-, _uiImage(nullptr)
 , _hasMipmaps(false)
+, _text("")
 {
     _texParams.minFilter = GL_LINEAR;
     _texParams.magFilter = GL_LINEAR;

cocos/renderer/CCVertexAttribBinding.cpp

@@ -46,7 +46,7 @@ static GLuint __maxVertexAttribs = 0;
 static std::vector<VertexAttribBinding*> __vertexAttribBindingCache;
 
 VertexAttribBinding::VertexAttribBinding() :
-    _handle(0), _attributes(), _meshIndexData(nullptr), _glProgramState(nullptr)
+    _handle(0), _meshIndexData(nullptr), _glProgramState(nullptr), _attributes()
 {
 }
 

cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.h

@@ -44,7 +44,6 @@
 
 @property (nonatomic, readonly, getter = isEditState) BOOL editState;
 @property (nonatomic, assign) void *editBox;
-@property (nonatomic, assign) NSString *text;
 @property (nonatomic, assign) NSRect frameRect;
 @property (nonatomic, assign) cocos2d::ui::EditBox::InputFlag dataInputMode;
 @property (nonatomic, assign) cocos2d::ui::EditBox::KeyboardReturnType keyboardReturnType;
@@ -62,11 +61,14 @@
 - (void)setInputMode:(cocos2d::ui::EditBox::InputMode)inputMode;
 - (void)setInputFlag:(cocos2d::ui::EditBox::InputFlag)inputFlag;
 - (void)setReturnType:(cocos2d::ui::EditBox::KeyboardReturnType)returnType;
-
+- (void)setTextHorizontalAlignment:(cocos2d::TextHAlignment)alignment;
 - (void)setPlaceHolder:(const char *)text;
 - (void)setVisible:(BOOL)visible;
 - (void)setTextColor:(NSColor*)color;
 - (void)setFont:(NSFont *)font;
 - (void)setPlaceholderFontColor:(NSColor*)color;
 - (void)setPlaceholderFont:(NSFont*)font;
+- (void)setText:(NSString *)text;
+- (const char*) getText;
+
 @end

cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm

@@ -298,6 +298,7 @@ - (void)setPlaceholderFont:(NSFont*)font
 {
     self.textInput.ccui_placeholderFont = font;
 }
+
 - (void)setText:(NSString *)text
 {
     self.textInput.ccui_text = text;

cocos/ui/UIVideoPlayer-android.cpp

@@ -71,11 +71,11 @@ using namespace cocos2d::experimental::ui;
 static std::unordered_map<int, VideoPlayer*> s_allVideoPlayers;
 
 VideoPlayer::VideoPlayer()
-: _videoPlayerIndex(-1)
-, _eventCallback(nullptr)
+: _fullScreenDirty(false)
 , _fullScreenEnabled(false)
-, _fullScreenDirty(false)
 , _keepAspectRatioEnabled(false)
+, _videoPlayerIndex(-1)
+, _eventCallback(nullptr)
 {
     _videoPlayerIndex = createVideoWidgetJNI();
     s_allVideoPlayers[_videoPlayerIndex] = this;

cocos/ui/UIVideoPlayer-ios.mm

@@ -263,12 +263,12 @@ -(void) stop
 //------------------------------------------------------------------------------------------------------------
 
 VideoPlayer::VideoPlayer()
-: _videoPlayerIndex(-1)
-, _eventCallback(nullptr)
-, _fullScreenEnabled(false)
+: _isPlaying(false)
 , _fullScreenDirty(false)
+, _fullScreenEnabled(false)
 , _keepAspectRatioEnabled(false)
-, _isPlaying(false)
+, _videoPlayerIndex(-1)
+, _eventCallback(nullptr)
 {
     _videoView = [[UIVideoViewWrapperIos alloc] init:this];
 

cocos/ui/UIWebViewImpl-ios.h

@@ -26,6 +26,7 @@
 #define __COCOS2D_UI_WEBVIEWIMPL_IOS_H_
 /// @cond DO_NOT_SHOW
 
+#include <stdint.h>
 #include <iosfwd>
 
 @class UIWebViewWrapper;