stevetranby
diff --git a/‎CHANGELOG‎
Lines changed: 74 additions & 0 deletions b/‎CHANGELOG‎
Lines changed: 74 additions & 0 deletions
diff --git a/‎cmake/Modules/CocosBuildHelpers.cmake‎
Lines changed: 27 additions & 25 deletions b/‎cmake/Modules/CocosBuildHelpers.cmake‎
Lines changed: 27 additions & 25 deletions
diff --git a/‎cmake/Modules/CocosBuildSet.cmake‎
Lines changed: 4 additions & 0 deletions b/‎cmake/Modules/CocosBuildSet.cmake‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎cocos/2d/CCLabel.cpp‎
Lines changed: 7 additions & 0 deletions b/‎cocos/2d/CCLabel.cpp‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎cocos/2d/CCLabel.h‎
Lines changed: 1 addition & 1 deletion b/‎cocos/2d/CCLabel.h‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎cocos/2d/CCLayer.cpp‎
Lines changed: 3 additions & 3 deletions b/‎cocos/2d/CCLayer.cpp‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎cocos/2d/CCMotionStreak.cpp‎
Lines changed: 6 additions & 0 deletions b/‎cocos/2d/CCMotionStreak.cpp‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎cocos/2d/CCProgressTimer.cpp‎
Lines changed: 6 additions & 0 deletions b/‎cocos/2d/CCProgressTimer.cpp‎
Lines changed: 6 additions & 0 deletions
@@ -1,3 +1,77 @@
+cocos2d-x-3.17.1 Nov.19 2018
+
+[REFINE]        Renderer: remove ccGLStateCache
+[REFINE]        Renderer: properly reduce clear buffer times to save energy
+[REFINE]        Engine: improve the reuse logic of sprite frames cache
+[REFINE]        Engine: add `GLView::setCursor` for desktop platforms
+[REFINE]        Engine: add methods to change icons for desktop platforms
+[REFINE]        UI: improve iPhone X home indicator handling behavior
+[REFINE]        UI: add line spacing support for system font on iOS and Android
+[REFINE]        UI: add support for pressed and disabled image in EditBox
+[REFINE]        UI: shrink extra label text if too long, prevent label too long crash
+[REFINE]        LUA: add binding code for cocos2d::Downloader
+[REFINE]        Android: add supporting SafeArea for most edge screens devices
+[REFINE]        Android: change default value of PROP_BUILD_TYPE from ndk-build to CMake
+[REFINE]        Android: update project config to gradle 4.6, sdk 28, android gradle plugin 3.1.0
+[REFINE]        Android: add ability to not stop music on game start in android
+[REFINE]        Windows: refine CCDevice-win32 BitmapDC
+[REFINE]        Windows: improve binary folder structure, copy resources to "Resources/" folder
+[REFINE]        Action: add ui::LoadingBar support to Progress actions
+[REFINE]        Network: support multiple parameters in SocketIO emit/send method
+[REFINE]        FileUtils: improve thread safety (use single recursive_mutex)
+[REFINE]        FileUitils: add getFileSize impl for Windows
+[REFINE]        FileUtils: add listFiles impl for Android and Windows platform
+[REFINE]        CMake: improve libraries link, compile options config
+[REFINE]        CMake: remove un-elegant prebuilt feature at internal cmake build scripts
+[REFINE]        3rd: upgrade libwebsockets to 2.4.2 with libuv enabled
+[REFINE]        3rd: improve cmake build scripts for external libs
+[REFINE]        Tests: add websocket latency test
+[REFINE]        Tests: add download multi task test case
+[REFINE]        cocos console: disable "gen-libs" command
+[REFINE]        Others: add another xbox 360 configuration
+[REFINE]        Others: remove ANT_ROOT env check on setup.py
+[REFINE]        Others: improve cmake tests in travis CI scripts
+
+[FIX]           Renderer: handle opengl recreate event for CameraBackgroundDepthBrush
+[FIX]           Renderer: fix some EVENT_RENDERER_RECREATED problem
+[FIX]           Engine: fix the last update time was not corrected if next delta time was zeroed 
+[FIX]           Engine: be safe to handle operator= in CCData
+[FIX]           Engine: aviod reading outside of the buffer when print log
+[FIX]           Engine: avoid duplicate find action when already found
+[FIX]           Engine: prevent free _bytes when src and dest are identical in CCData
+[FIX]           Engine: fix Console::loop() consumes 100% of CPU usage
+[FIX]           Engine: fix Action doesn't work when follow Node added PhysicsBody
+[FIX]           UI: fix locate image path relative to tsx file error in TiledMap
+[FIX]           UI: fix several bugs with button's title, include memory leak
+[FIX]           UI: fix LabelLetter::isVisible always return false
+[FIX]           UI: fix not support sprite frame when ignoreContentAdaptWithSize is false
+[FIX]           UI: fix out of range access in Label 
+[FIX]           UI: fix Widget::getAncestorWidget error
+[FIX]           UI: fix "known incorrect sRGB profile" by mogrify convert png format
+[FIX]           UI: fix iOS editbox EndAction wrong when single line mode (UITextField)
+[FIX]           UI: Fix for Label and UIRichEdit text trailing space trimming
+[FIX]           Audio: fix AudioEngine rotateBufferThread crash on iOS
+[FIX]           Audio: add extra init checks in pcm audio service, avoid crash in PcmAudioService 
+[FIX]           Audio: fix AVAudioSessionErrorCodeCannotStartPlaying error may occur on Apple
+[FIX]           Audio: fix background music may resumes even the application is on the background on Android
+[FIX]           Network: fix memory leaks in WebSocket
+[FIX]           Network: fix websocket memory zereoing size error
+[FIX]           Network: fix https downloader timeout on win/mac
+[FIX]           Network: fix "cc.loader.load" convert url error
+[FIX]           iOS: fix project build warnings in Xcode
+[FIX]           iOS: fix crash when saving gray colorspace image
+[FIX]           Android: shorten C++ build path, reduce long path error on Windows
+[FIX]           Android: keep cocos2dx activity at task root by mark "singleTask" in manifest
+[FIX]           Android: fix crash caused by JNIEnv null pointer in getStringUTFCharsJNI function
+[FIX]           Android: use 'Binary names' style on JNI for ClassLoader.loadClass
+[FIX]           Action: fix repeat CallFunc for some times, may never stop
+[FIX]           Physics: fix PhysicsJointMotor setRate and getRate Bad Access Crash
+[FIX]           FileUtils: fix removeDirectory() failure on win32
+[FIX]           FileUtils: let getContents return an error code when the filename is a directory
+[FIX]           FileUtils: let isFileExistInternal return false when folder as parameter on Linux
+[FIX]           CMake: fix project name always be "TemplateCpp" when create a new project
+[FIX]           Tests: fix auto test stop in cpp-tests project
+
 cocos2d-x-3.17 May.21 2018
 
 [HIGHLIGHT]     Android: support Android Studio 3.0, NDK 16
 
@@ -45,25 +45,18 @@ function(cocos_mark_multi_resources res_out)
     set(${res_out} ${tmp_file_list} PARENT_SCOPE)
 endfunction()
 
-# get `cocos_target` depend all dlls, save the result in `all_depend_dlls_out`
-function(get_target_depends_ext_dlls cocos_target all_depend_dlls_out)
-    set(all_depend_ext_dlls)
+# get all linked libraries including transitive ones, recursive
+function(search_depend_libs_recursive cocos_target all_depends_out)
+    set(all_depends_inner)
     set(targets_prepare_search ${cocos_target})
-    # targets_prepare_search, target need find ext libs
-    set(have_searched_targets)
-    set(need_search_targets)
     while(true)
         foreach(tmp_target ${targets_prepare_search})
             get_target_property(tmp_depend_libs ${tmp_target} LINK_LIBRARIES)
             list(REMOVE_ITEM targets_prepare_search ${tmp_target})
-            # target itself use_cocos_pkg
             list(APPEND tmp_depend_libs ${tmp_target})
             foreach(depend_lib ${tmp_depend_libs})
                 if(TARGET ${depend_lib})
-                    get_target_property(tmp_dlls ${depend_lib} CC_DEPEND_DLLS)
-                    if(tmp_dlls)
-                        list(APPEND all_depend_ext_dlls ${tmp_dlls})
-                    endif()
+                    list(APPEND all_depends_inner ${depend_lib})
                     if(NOT (depend_lib STREQUAL tmp_target))
                         list(APPEND targets_prepare_search ${depend_lib})
                     endif()
@@ -75,6 +68,23 @@ function(get_target_depends_ext_dlls cocos_target all_depend_dlls_out)
             break()
         endif()
     endwhile(true)
+    set(${all_depends_out} ${all_depends_inner} PARENT_SCOPE)
+endfunction()
+
+# get `cocos_target` depend all dlls, save the result in `all_depend_dlls_out`
+function(get_target_depends_ext_dlls cocos_target all_depend_dlls_out)
+
+    set(depend_libs)
+    set(all_depend_ext_dlls)
+    search_depend_libs_recursive(${cocos_target} depend_libs)
+    foreach(depend_lib ${depend_libs})
+        if(TARGET ${depend_lib})
+            get_target_property(tmp_dlls ${depend_lib} CC_DEPEND_DLLS)
+            if(tmp_dlls)
+                list(APPEND all_depend_ext_dlls ${tmp_dlls})
+            endif()
+        endif()
+    endforeach()
 
     set(${all_depend_dlls_out} ${all_depend_ext_dlls} PARENT_SCOPE)
 endfunction()
@@ -231,26 +241,18 @@ macro(cocos_pak_xcode cocos_target)
     set(MACOSX_BUNDLE_LONG_VERSION_STRING ${COCOS_APP_LONG_VERSION_STRING})
     set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${COCOS_APP_SHORT_VERSION_STRING})
 
-    message("cocos package: ${cocos_target}, plist file: ${COCOS_APP_INFO_PLIST}")
+    message(STATUS "cocos package: ${cocos_target}, plist file: ${COCOS_APP_INFO_PLIST}")
 
    cocos_config_app_xcode_property(${cocos_target})
 endmacro()
 
 # set Xcode property for application, include all depend target
 macro(cocos_config_app_xcode_property cocos_app)
-    cocos_config_target_xcode_property(${cocos_app})
-    # for example, cocos_target: cpp-tests link engine_lib: cocos2d
-    get_target_property(engine_libs ${cocos_app} LINK_LIBRARIES)
-    foreach(engine_lib ${engine_libs})
-        if(TARGET ${engine_lib})
-            cocos_config_target_xcode_property(${engine_lib})
-            # for example, engine_lib: cocos2d link external_lib: flatbuffers
-            get_target_property(external_libs ${engine_lib} LINK_LIBRARIES)
-            foreach(external_lib ${external_libs})
-                if(TARGET ${external_lib})
-                    cocos_config_target_xcode_property(${external_lib})
-                endif()
-            endforeach()
+    set(depend_libs)
+    search_depend_libs_recursive(${cocos_app} depend_libs)
+    foreach(depend_lib ${depend_libs})
+        if(TARGET ${depend_lib})
+            cocos_config_target_xcode_property(${depend_lib})
         endif()
     endforeach()
 endmacro()
 
@@ -10,6 +10,10 @@ set(CMAKE_DEBUG_TARGET_PROPERTIES
 # some useful variables for every one cocos project
 set(ENGINE_BINARY_PATH ${PROJECT_BINARY_DIR}/engine)
 
+if(CMAKE_TOOLCHAIN_FILE)
+    message(STATUS "using toolchain file:" ${CMAKE_TOOLCHAIN_FILE})
+endif()
+
 message(STATUS "PROJECT_NAME:" ${PROJECT_NAME})
 message(STATUS "PROJECT_SOURCE_DIR:" ${PROJECT_SOURCE_DIR})
 message(STATUS "COCOS2DX_ROOT_PATH:" ${COCOS2DX_ROOT_PATH})
 
@@ -677,6 +677,13 @@ void Label::setString(const std::string& text)
         {
             _utf32Text  = utf32String;
         }
+
+        CCASSERT(_utf32Text.length() <= CC_LABEL_MAX_LENGTH, "Length of text should be less then 16384");
+        if (_utf32Text.length() > CC_LABEL_MAX_LENGTH)
+        {
+            cocos2d::log("Error: Label text is too long %d > %d and it will be truncated!", _utf32Text.length(), CC_LABEL_MAX_LENGTH);
+            _utf32Text = _utf32Text.substr(0, CC_LABEL_MAX_LENGTH);
+        }
     }
 }
 
 
@@ -559,7 +559,7 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      
      @warning Not support system font.
      @return the type of label
-     @since v3.18.0
+     @since v3.17.1
      */
     LabelType getLabelType() const { return _currentLabelType; }
 
 
@@ -620,13 +620,13 @@ void LayerColor::onDraw(const Mat4& transform, uint32_t /*flags*/)
     getGLProgram()->use();
     getGLProgram()->setUniformsForBuiltins(transform);
 
-    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION);
-    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR);
-    
     //
     // Attributes
     //
     glBindBuffer(GL_ARRAY_BUFFER, 0);
+    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION);
+    glDisableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORD);
+    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR);
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, _noMVPVertices);
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_FLOAT, GL_FALSE, 0, _squareColors);
 
 
@@ -390,6 +390,12 @@ void MotionStreak::onDraw(const Mat4 &transform, uint32_t /*flags*/)
 
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, _texture->getName());
+    auto alphaTexID = _texture->getAlphaTextureName();
+    if (alphaTexID > 0)
+    {
+        glActiveTexture(GL_TEXTURE0 + 1);
+        glBindTexture(GL_TEXTURE_2D, alphaTexID);
+    }
 
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, 0, _vertices);
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, _texCoords);
 
@@ -519,6 +519,12 @@ void ProgressTimer::onDraw(const Mat4 &transform, uint32_t /*flags*/)
 
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, _sprite->getTexture()->getName());
+    auto alphaTexID = _sprite->getTexture()->getAlphaTextureName();
+    if (alphaTexID > 0)
+    {
+        glActiveTexture(GL_TEXTURE0 + 1);
+        glBindTexture(GL_TEXTURE_2D, alphaTexID);
+    }
 
     glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, sizeof(_vertexData[0]) , &_vertexData[0].vertices);
     glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, sizeof(_vertexData[0]), &_vertexData[0].texCoords);
Original file line number	Diff line number	Diff line change
`@@ -677,6 +677,13 @@ void Label::setString(const std::string& text)`
`677`	`677`	`{`
`678`	`678`	`_utf32Text = utf32String;`
`679`	`679`	`}`
	`680`	`+`
	`681`	`+ CCASSERT(_utf32Text.length() <= CC_LABEL_MAX_LENGTH, "Length of text should be less then 16384");`
	`682`	`+ if (_utf32Text.length() > CC_LABEL_MAX_LENGTH)`
	`683`	`+ {`
	`684`	`+ cocos2d::log("Error: Label text is too long %d > %d and it will be truncated!", _utf32Text.length(), CC_LABEL_MAX_LENGTH);`
	`685`	`+ _utf32Text = _utf32Text.substr(0, CC_LABEL_MAX_LENGTH);`
	`686`	`+ }`
`680`	`687`	`}`
`681`	`688`	`}`
`682`	`689`